From 99481ab82a386c30d970592c5b8804e5c8e6df6e Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Thu, 4 Jun 2020 14:25:03 +0200
Subject: Rev: 4653
---
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 +-
mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +-
.../policy/private/naplo/osztalyozo/stat-pre.php | 6 +++--
.../module-naplo/html/osztalyozo/stat.phtml | 1 -
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 +-
17 files changed, 31 insertions(+), 30 deletions(-)
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4652
+4653
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 146427d5..b5859656 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 @@
-4652
+4653
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4652
+4653
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 146427d5..b5859656 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 @@
-4652
+4653
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 146427d5..b5859656 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 @@
-4652
+4653
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 146427d5..b5859656 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 @@
-4652
+4653
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
index 994956de..7fc0a8de 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php
@@ -256,8 +256,10 @@
// záradékhoz (2015)
$ADAT['diakAdat'][$diakId]['bukottTargy'][] = $ADAT['targyAdat'][$targyId]['targyNev'];
}
- if (isset($jegyAdat['megjegyzes']) && $zaraskorTag) {
- $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++;
+ if ($zaraskorTag) {
+ if (isset($jegyAdat['megjegyzes'])) {
+ $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++;
+ }
if (in_array($jegyAdat['jegyTipus'],array('jegy','féljegy'))) {
$ADAT['jegyEloszlas'][$targyId][$jegyAdat['jegy']]++;
if (!in_array($targyId,array_merge($ADAT['szorgalomTargyIdk'],$ADAT['magatartasTargyIdk'])) && $zaraskorTag) $ADAT['jegyEloszlas']['osszes'][$jegyAdat['jegy']]++;
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml
index 10f7e7f8..13d639f5 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml
@@ -531,7 +531,6 @@
echo '/';
echo ''.number_format($ADAT['tantargyiAtlagok']['osztaly'], 2, ',', '.').'';
echo '';
-
// Félévi átlagok
echo '| ';
if (_BEIRHATO) echo '';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 146427d5..b5859656 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4652
+4653
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index ae8bd9a5..51d75cf9 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4652
-4241df878f9ce5a3a5c1bd5a4644ed9b mayor-fenntarto-rev4652.tgz
-b76435cec19a79eff129713a4059d0f2 mayor-installer-sulix-rev4652.tgz
-38c5d35cb0cda6a6a6a417812da3297a mayor-wiki-rev4652.tgz
-8efd11921700a48dd2926bc45c918ece mayor-installer-rev4652.tgz
-72f54739c564828efe87f71743ee0c36 mayor-portal-rev4652.tgz
-0bb5c5771f14d198fd47081e94f245d9 mayor-felveteli-rev4652.tgz
-fa1b34e9384d14b9f552d2ed23847e70 mayor-jatek-rev4652.tgz
-6fc090207bfda9fb28b3c9a9400b598b mayor-locales-jp_JP-rev4652.tgz
-0bbc8c233b971803fcf78a911f9aa089 mayor-locales-de_DE-rev4652.tgz
-16c7129a4a774bdc654dac481c1f3043 mayor-locales-en_US-rev4652.tgz
-7952eb7f788e6bad99f62e4ad3535c12 mayor-naplo-rev4652.tgz
-af484cbb50616c407009ec0aeb53648b mayor-base-rev4652.tgz
+Revision 4653
+e1da81dde355c3b2a27222f55485f4d7 mayor-fenntarto-rev4653.tgz
+7db82c9dea4c9474dc0ea43570549b82 mayor-installer-sulix-rev4653.tgz
+b6b523a7a97959c3043191e971546d5f mayor-wiki-rev4653.tgz
+2177a02b73ee7fa9e04bfadecb0d9bb4 mayor-installer-rev4653.tgz
+48775a1f9977e4bd131d42b20a682975 mayor-portal-rev4653.tgz
+5d31067b8865d927aa735830910b1fd4 mayor-felveteli-rev4653.tgz
+b422baa7722e322c8242f10231b24014 mayor-jatek-rev4653.tgz
+c1c3eeb0593c686c9eb72fe3a2eba342 mayor-locales-jp_JP-rev4653.tgz
+b9915bed4c51e5c0f7eea228477c8325 mayor-locales-de_DE-rev4653.tgz
+5bc43b6037d8e63b2c4743d6a7233dd3 mayor-locales-en_US-rev4653.tgz
+0d9fd05779684646dee6cbd04f203136 mayor-naplo-rev4653.tgz
+2911fe7c85c52c67b64341248eba9d7d mayor-base-rev4653.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 146427d5..b5859656 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4652
+4653
diff --git a/rev.txt b/rev.txt
index 146427d5..b5859656 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4652
+4653
--
cgit v1.2.3
|