Rev: 4574rev4574

19 files changed, 41 insertions, 40 deletions

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh b/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
index d44d28e4..33407920 100755
--- a/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
+++ b/mayor-orig/mayor-installer-orig/install.d/35createdatabases.sh
@@ -98,7 +98,7 @@ read -n 1 -p "Telepíthetem? (i/N)" -s DO
 if [ "$DO" != "i" ]; then echo " ok, kiléptem..."; exit 1; fi
 echo -e "\n"
 
-read -p " A mysql root jelszó (a begépelt szöveg nem látszik!): " -s MYSQLROOTPW
+read -p " A mysql root jelszó - ha van - (a begépelt szöveg nem látszik!): " -s MYSQLROOTPW
 
 if [ ! -e $MAYORDIR/config/main.conf ]; then 
     cat $MAYORDIR/config/main.conf.example | sed s/%SQLPW%/$MYSQLROOTPW/ > $MAYORDIR/config/main.conf
@@ -107,9 +107,9 @@ fi
 
 if [ "$MYSQLROOTPW" = "" ]; 
 then 
-    MYSQLROOTPWSTR=""; 
+    MYSQLROOTPWSTR="-f"; 
 else 
-    MYSQLROOTPWSTR="-p$MYSQLROOTPW --user=root"
+    MYSQLROOTPWSTR="-f -p$MYSQLROOTPW --user=root"
 fi
 
 cat /tmp/mysql/mayor-login.sql | mysql $MYSQLROOTPWSTR --default-character-set=utf8
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4572
+4574
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 6dc04883..7b690e22 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 @@
-4572
+4574
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4572
+4574
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 6dc04883..7b690e22 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 @@
-4572
+4574
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 6dc04883..7b690e22 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 @@
-4572
+4574
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 6dc04883..7b690e22 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 @@
-4572
+4574
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 644fa360..63600aa9 100644
--- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
+++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/intezmeny.sql
@@ -323,7 +323,7 @@ CREATE TABLE `tankorTipus` (
   `jelenlet` enum('kötelező','nem kötelező') COLLATE utf8_hungarian_ci NOT NULL,
   `regisztralando` enum('igen','nem') COLLATE utf8_hungarian_ci DEFAULT NULL,
   `hianyzasBeleszamit` enum('igen','nem') COLLATE utf8_hungarian_ci DEFAULT NULL,
-  `jelleg` enum('elmélet','gyakorlat') COLLATE utf8_hungarian_ci DEFAULT 'elmélet',
+  `jelleg` enum('elmélet','gyakorlat','osztályfüggetlen') COLLATE utf8_hungarian_ci DEFAULT 'elmélet',
   `nevsor` enum('állandó','változtatható') COLLATE utf8_hungarian_ci DEFAULT NULL,
   `tankorJel` varchar(3) COLLATE utf8_hungarian_ci DEFAULT NULL,
   PRIMARY KEY (`tankorTipusId`),
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
index 569953b3..5d998779 100644
--- a/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
+++ b/mayor-orig/mayor-naplo/www/include/menu/private/hu_HU/module-naplo.php
@@ -150,7 +150,7 @@
 	$MENU['modules']['naplo']['sub']['haladasi'] = array(
 	    'hetes' => array(array('txt' => 'Hetesek')),
 	    'stat' => array(array('txt' => 'Haladási statisztika')),
-	    'elszamolas' => array(array('txt' => 'Munkaidő')),
+	    'elszamolas' => array(array('txt' => 'Munkaidő elszámolás')),
 	);
 	if (MAYOR_SOCIAL === true) {
 	    $MENU['modules']['naplo']['sub']['haladasi']['helyettesites'] = array(array('txt' => 'Helyettesítés kezelés'));
@@ -302,7 +302,7 @@
 	    'specialis' => array(array('txt' => 'Speciális nap')),
 	    'elmaradas' => array(array('txt' => 'Haladási elmaradások')),
 	    'stat' => array(array('txt' => 'Haladási statisztika')),
-	    'elszamolas' => array(array('txt' => 'Elszámolás')),
+	    'elszamolas' => array(array('txt' => 'Munkaidő elszámolás')),
 	    'oralatogatas' => array(array('txt' => 'Óralátogatás')),
 	    'hetes' => array(array('txt' => 'Hetesek')),
 	);
@@ -431,7 +431,7 @@
 	    'specialis' => array(array('txt' => 'Speciális nap', 'rejtett' => true)),
 	    'elmaradas' => array(array('txt' => 'Haladási elmaradások', 'rejtett' => true)),
 	    'stat' => array(array('txt' => 'Haladási statisztika', 'rejtett' => true)),
-	    'elszamolas' => array(array('txt' => 'Elszámolás', 'rejtett' => true)),
+	    'elszamolas' => array(array('txt' => 'Munkaidő elszámolás', 'rejtett' => true)),
 	    'oralatogatas' => array(array('txt' => 'Óralátogatás', 'rejtett' => true)),
 	    'hetes' => array(array('txt' => 'Hetesek')),
 	);
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
index 8dc73ed5..84d59777 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/cronFutar.phtml
@@ -155,9 +155,10 @@
 	    $str[] = 'tárgyból';
 
 	    $str[] = '<b>'.($KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['hivatalos']).'</b>';
-	    $str[] = '(röviden: '.$KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['rovid'].'),';
-	    $str[] = $D['jegyAdat']['jegyTipus'];
-	    $str[] = 'típusú értékelés került beírásra az osztályozó naplóba.';
+	    $str[] = '(röviden: '.$KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['rovid'].')';
+               if (!in_array($D['jegyAdat']['jegyTipus'],array('jegy','féljegy'))) $str[] = $D['jegyAdat']['jegyTipus'].' típusú';
+            $str[] = 'értékelés került beírásra az osztályozó naplóba';
+
 	}
 
 	if (is_array($D['oraAdat'])) {
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
index ab05f322..a70662e9 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/hirnok/hirnok.phtml
@@ -72,7 +72,7 @@
     function putHirnokBadge_jegy($D) {
 	echo '<a href="'.href('index.php?page=naplo&sub=osztalyozo&f=diak').'">';
 	// echo '<span class="icon-pencil"></span>';
-	if (in_array($D['jegyAdat']['jegy'],array(1,2,3,4,5))) echo '<span class="material-icons">looks_'.intval(($D['jegyAdat']['jegy'])).'</span>';
+	if (in_array($D['jegyAdat']['jegy'],array(1,2,3,4,5)) && in_array($D['jegyAdat']['jegyTipus'],array('jegy','féljegy'))) echo '<span class="material-icons">looks_'.intval(($D['jegyAdat']['jegy'])).'</span>';
 	else echo '<span class="material-icons">mode_edit</span>';
 	echo '</a>';
     }
@@ -232,9 +232,9 @@
 	    $str[] = 'tárgyból';
 
 	    $str[] = '<b>'.($KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['hivatalos']).'</b>';
-	    $str[] = '('.$KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['rovid'].'),';
-	    $str[] = $D['jegyAdat']['jegyTipus'];
-	    $str[] = 'típusú értékelés került beírásra az osztályozó naplóba.';
+	    $str[] = '('.$KOVETELMENY[$D['jegyAdat']['jegyTipus']][$D['jegyAdat']['jegy']]['rovid'].')';
+		if (!in_array($D['jegyAdat']['jegyTipus'],array('jegy','féljegy'))) $str[] = $D['jegyAdat']['jegyTipus'].' típusú';
+	    $str[] = 'értékelés került beírásra az osztályozó naplóba';
 	}
 
 	if (is_array($D['oraAdat'])) {
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 6dc04883..7b690e22 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4572
+4574
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index c63dd0bc..e76bc873 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4572
-692c13c72d5df37d8d70b9ae5661835d  mayor-fenntarto-rev4572.tgz
-0f0c2adac919cb499957260caa0e338a  mayor-installer-sulix-rev4572.tgz
-552b324cdf8db7b7b06e8e5fdfd8411c  mayor-wiki-rev4572.tgz
-5b8666552d2b7d410069a92616592750  mayor-installer-rev4572.tgz
-3a0235ef57324e2dc3c2a160c5df0c30  mayor-portal-rev4572.tgz
-0a5615bb34bab124ec03639983a9b43d  mayor-felveteli-rev4572.tgz
-2a1c2b27ddeca5bc60d0a4e80aff2dba  mayor-jatek-rev4572.tgz
-f1284f03c3d766dedfe1a3cd1d02820a  mayor-locales-jp_JP-rev4572.tgz
-4f317d3a0e42452e594ffc4327bd166f  mayor-locales-de_DE-rev4572.tgz
-429a896cbddb4a4969a3816231146e7b  mayor-locales-en_US-rev4572.tgz
-08575ea7aa3a03e86d0f30a021fb6850  mayor-naplo-rev4572.tgz
-7f2954fa516e49e5600f04b19f8b86a4  mayor-base-rev4572.tgz
+Revision 4574
+41241dc58e3e7195301250cee3643353  mayor-fenntarto-rev4574.tgz
+08303897f4392e885330f216208bee21  mayor-installer-sulix-rev4574.tgz
+3b4d28181cc389248cb1d9fa5a9a8dc9  mayor-wiki-rev4574.tgz
+32d340be492dc2779569c5f2bf090df5  mayor-installer-rev4574.tgz
+914938cf3172fee8110af7c69a97484c  mayor-portal-rev4574.tgz
+546ffeb35e70511c6c5af5ae509bdb04  mayor-felveteli-rev4574.tgz
+d8168832168dd23756fede70091440a9  mayor-jatek-rev4574.tgz
+cb5138812afb40c0469c9aa0e1bf2d80  mayor-locales-jp_JP-rev4574.tgz
+2ddec91a2d29e23faacb2b2dfaf5cb6f  mayor-locales-de_DE-rev4574.tgz
+8cdf7b214a0915994ef20c63d84413be  mayor-locales-en_US-rev4574.tgz
+e19850594aab19deeb367b4e04afe8fc  mayor-naplo-rev4574.tgz
+ced58263b52c1748113a85fa6ad70331  mayor-base-rev4574.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 6dc04883..7b690e22 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4572
+4574