aboutsummaryrefslogtreecommitdiffstats
path: root/mayor-orig
diff options
context:
space:
mode:
authorM.Gergo2019-08-14 17:54:23 +0200
committerM.Gergo2019-08-14 17:54:23 +0200
commita4f28686f7de4a0ca86c2215d28bddb9a378335a (patch)
treee0894f634b11dd8599811c34ccc649b919dbd711 /mayor-orig
parent729b5f5c66977a3b66a9a3e8bdaa35a3b9e7022a (diff)
downloadmayor-a4f28686f7de4a0ca86c2215d28bddb9a378335a.tar.gz
mayor-a4f28686f7de4a0ca86c2215d28bddb9a378335a.zip
Rev: 4526rev4526
Diffstat (limited to 'mayor-orig')
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/munkaterv.php8
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
15 files changed, 32 insertions, 28 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4525
+4526
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 de1a6219..322150f6 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 @@
-4525
+4526
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4525
+4526
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 de1a6219..322150f6 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 @@
-4525
+4526
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 de1a6219..322150f6 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 @@
-4525
+4526
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 de1a6219..322150f6 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 @@
-4525
+4526
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/munkaterv.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/munkaterv.php
index a27528a0..f1900371 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/munkaterv.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/tanev/munkaterv.php
@@ -90,6 +90,9 @@
$megjegyzes = $Megjegyzes[$i];
$_csengetesiRendTipus = $csengetesiRendTipus[$i];
if ($tipus == 'tanítási nap') {
+ // ????
+ // kellene ellenőrizni, hogy szorgalmi időszakon belül van-e, vagy engedjük meg ezen kívül is a tanítási napot? Pótnap?
+ // ????
$orarendiHet = $OrarendiHet[$i];
if ($orarendiHet == 0) { // most állítjuk be tanítási napnak, és nem rendelkeztek az órarendi hétről...
// kérdezzük le, hogy van-e másik munkatervben már megadott órarendi hét erre a napra
@@ -106,8 +109,9 @@
$orarendiHet = 0;
}
if (
- ($time >= strtotime($_TANEV['kezdesDt']) && $time <= strtotime($_TANEV['zarasDt']))
- && ($tipus != 'tanítási nap' || count($Hetek) == 0 || in_array($orarendiHet, $Hetek))
+ // -- lehessen szorgalmi időszakon kívüli napokat is módosítani - ha már eltároljuk...
+ // ($time >= strtotime($_TANEV['kezdesDt']) && $time <= strtotime($_TANEV['zarasDt'])) &&
+ ($tipus != 'tanítási nap' || count($Hetek) == 0 || in_array($orarendiHet, $Hetek))
) {
$q = "UPDATE nap SET csengetesiRendTipus='%s',tipus='%s', megjegyzes='%s' WHERE dt='%s' AND munkatervId=%u";
$v = array($_csengetesiRendTipus, $tipus, $megjegyzes, $dt, $munkatervId);
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index de1a6219..322150f6 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4525
+4526
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 3a5108ef..5e6543d1 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4525
-4769cde75798d977309528f78b297341 mayor-fenntarto-rev4525.tgz
-08fa4d78568983ec88ec1f262438a54a mayor-installer-sulix-rev4525.tgz
-bc9a2a9e71a194832bff73ae321a7205 mayor-wiki-rev4525.tgz
-8aa9132deb7040699fd7fedaeb030d8f mayor-installer-rev4525.tgz
-1af7c06b7f979d2d5c5488e63373a7c3 mayor-portal-rev4525.tgz
-7025159d117f811b1d984c31d111bd60 mayor-felveteli-rev4525.tgz
-5008f25a2ccaeee3c68254e249b4edb6 mayor-jatek-rev4525.tgz
-a63306a1cba4c4443c7d520baa60f328 mayor-locales-jp_JP-rev4525.tgz
-ebd819298cf9456a55ead96a9a4b8a7e mayor-locales-de_DE-rev4525.tgz
-0bb6075735ce0d34448f29c75d025911 mayor-locales-en_US-rev4525.tgz
-7d5eab11cc6b5574cd267e0b8fc17924 mayor-naplo-rev4525.tgz
-739bdaa1737f0302739360704be264e7 mayor-base-rev4525.tgz
+Revision 4526
+e1d21d7c843f5140b9641f5f9329c91d mayor-fenntarto-rev4526.tgz
+5e50e2244727c3b2a001a3fdb4bbb18d mayor-installer-sulix-rev4526.tgz
+2cc2d13979a2534b51e96178040ac843 mayor-wiki-rev4526.tgz
+ac440378a4829dd3ebdc64ee7d614844 mayor-installer-rev4526.tgz
+57bd6b4680f6b71aeaa62b4b26c09a69 mayor-portal-rev4526.tgz
+0523f87af2a531b5912c6033f0ade6a9 mayor-felveteli-rev4526.tgz
+4c5ea291f6336296cae5b4e2dc7f86fe mayor-jatek-rev4526.tgz
+3224f7af64daa5a410c597b6ef4047ed mayor-locales-jp_JP-rev4526.tgz
+ec9938f20addefe1a74dd2269348d1e2 mayor-locales-de_DE-rev4526.tgz
+dacdc683c8a590bd65b4ee1b41180ffc mayor-locales-en_US-rev4526.tgz
+0d075bb5f844370a9bd20b3d70545540 mayor-naplo-rev4526.tgz
+be9a1179a3adde150e481c5a09ffc2bc mayor-base-rev4526.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index de1a6219..322150f6 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4525
+4526