From 973ae816e66352e9d97facf92f8ffc3bcc0d89bd Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 1 Apr 2020 12:10:03 +0200
Subject: Rev: 4645

---
 mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

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 ff844583..df260d9e 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 @@
-4644
+4645
-- 
cgit v1.2.3


From ad6a38cc882f9da97aae74bb8c48ad9f70bc39e8 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 1 Apr 2020 15:50:03 +0200
Subject: Rev: 4646

---
 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 +-
 .../private/naplo/haladasi/hazifeladat-pre.php     |  2 +-
 .../module-naplo/html/haladasi/hazifeladat.phtml   |  9 ++++++--
 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, 35 insertions(+), 30 deletions(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4645
+4646
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 df260d9e..432cde09 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 @@
-4645
+4646
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4645
+4646
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 df260d9e..432cde09 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 @@
-4645
+4646
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 df260d9e..432cde09 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 @@
-4645
+4646
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 df260d9e..432cde09 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 @@
-4645
+4646
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
index 3fd87f21..86ca57a0 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php
@@ -61,7 +61,7 @@
 	$hazifeladatFeltoltesEngedely = readVariable($_POST['hazifeladatFeltoltesEngedely'],'id',0);
 	if ($hazifeladatId>0) { // update
 	    if (is_null($hazifeladatHataridoDt)) {
-		$q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u";
+		$q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt=NULL WHERE hazifeladatId=%u";
 		$values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']);
 	    } else {
 		$q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt='%s' WHERE hazifeladatId=%u";
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index e6e2d4e6..98337d4e 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -79,7 +79,10 @@ echo '<style type="text/css">
 		    if ($ADAT['hazifeladatDiak']['tanarLattamDt']!='') {
 			echo ' <span class="icon-ok-sign" style="color: lightgreen"></span> '.$ADAT['hazifeladatDiak']['tanarLattamDt'];
 		    }
-		    if (strtotime($ADAT['hazifeladatDiak']['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) {
+
+		    if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' 
+			&& $D['hazifeladatDiakFileDt']!=''
+			&& strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) {
 			echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>';
 		    }
 		    echo '</li></ul>';
@@ -222,7 +225,9 @@ echo '<style type="text/css">
 	    echo '<td colspan="1" class="'.ekezettelen($D['hazifeladatDiakStatus']).'">'.$D['hazifeladatDiakStatus'].'</td>';
 	    //echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>';
 	    echo '<td>';
-		    if (strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) {
+		    if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' 
+			&& $D['hazifeladatDiakFileDt']!=''
+			&& strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) {
 			echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>';
 		    }
 	    echo '</td>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index df260d9e..432cde09 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4645
+4646
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 5b6a7746..fe92affd 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4645
-32c59157c46a9f7cc850c8d8c750b371  mayor-fenntarto-rev4645.tgz
-651b082a2c563e7c04c1cc28720f3b1b  mayor-installer-sulix-rev4645.tgz
-6cc5495b1320ce5d0315fed2edbc079a  mayor-wiki-rev4645.tgz
-b660418d027155d4d82d131c8d811930  mayor-installer-rev4645.tgz
-9b3be1d5ee811e33aef786bd4667332c  mayor-portal-rev4645.tgz
-0be48fd4cb4930f3d59cff0e043bb214  mayor-felveteli-rev4645.tgz
-85ce809f84e94d88f33b94e69d990ac0  mayor-jatek-rev4645.tgz
-574c46fd12cb0d6a1a8dbfc3bce1b778  mayor-locales-jp_JP-rev4645.tgz
-2f70947d29180b179a4af3d3677bd598  mayor-locales-de_DE-rev4645.tgz
-4897ac638fb9bee6468adfd2c07de96d  mayor-locales-en_US-rev4645.tgz
-b101ac6d1ccdf125ee09da69396b8406  mayor-naplo-rev4645.tgz
-c8ef0da17aa2e3dff7ca4d89082a4a29  mayor-base-rev4645.tgz
+Revision 4646
+ebb35417a13f1d3ca611030256dc53dc  mayor-fenntarto-rev4646.tgz
+f928b55f1f2812aad961e91bd15b83f3  mayor-installer-sulix-rev4646.tgz
+ac834d79ee8faaf09af15e9753e39967  mayor-wiki-rev4646.tgz
+48c0acd54dbc6c49219c1e6219d63d31  mayor-installer-rev4646.tgz
+6e1b6103616ac8595c6f529845cd51ea  mayor-portal-rev4646.tgz
+cdb74cd9e35df127608830e829cb3a53  mayor-felveteli-rev4646.tgz
+3d18adcd4647b8f82adbda6bf9e671c7  mayor-jatek-rev4646.tgz
+00f525d935bf0317bc39ae0c47ed4d0d  mayor-locales-jp_JP-rev4646.tgz
+d47203fe463e09468d3a891191b306db  mayor-locales-de_DE-rev4646.tgz
+63f29492349230b00a9aa1e5a44e9934  mayor-locales-en_US-rev4646.tgz
+ab798136849abe56af0f79334800e949  mayor-naplo-rev4646.tgz
+db099677c69ea7fecd9ee00326a6abdd  mayor-base-rev4646.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index df260d9e..432cde09 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4645
+4646
diff --git a/rev.txt b/rev.txt
index df260d9e..432cde09 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4645
+4646
-- 
cgit v1.2.3


From 47ee90f56d46edd6d33620b562f719b0a1601df7 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Fri, 3 Apr 2020 21:45:04 +0200
Subject: Rev: 4647

---
 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 +-
 .../module-naplo/css/haladasi/hazifeladat.css      |  4 ++++
 .../module-naplo/html/haladasi/hazifeladat.phtml   | 11 ++++++++-
 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, 41 insertions(+), 28 deletions(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4646
+4647
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 432cde09..209cee31 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 @@
-4646
+4647
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4646
+4647
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 432cde09..209cee31 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 @@
-4646
+4647
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 432cde09..209cee31 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 @@
-4646
+4647
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 432cde09..209cee31 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 @@
-4646
+4647
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
index a02734f3..69a72375 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
@@ -66,9 +66,13 @@
     
     table.hazifeladatDiak tr td.kesz { background-color: lightgreen; color:white; text-align:center }
 
+    table.hazifeladatDiak tr td.diakNev.extraDiak { background-color: violet; }
+
     input.modosit { background-color: #ffeb3b; }
     span#hintDt {margin-left:5px; font-size:x-small; color:#888; cursor: copy;}
     span#hintDt span { padding-right:2px; }
     span#hintDt:hover { color:black; }
 
     span.hataridoUtaniFeltoltes { margin-left: 2px; font-size: x-small; background-color: #e91e63; border-radius:2px; padding: 0px 2px; color:white; }
+
+    
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index 98337d4e..1587f3b0 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -216,11 +216,20 @@ echo '<style type="text/css">
 		echo '<tr><th>diák</th><th colspan="2">státusz</th><th colspan="1">csatolmány</th><th>láttam</th></tr>';
 	echo '</thead>';
 
+	/* kiegészítjük a tankörnévsort az egyéb diákokkal, akik látták ezt a házifeladatot */
+	for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) {
+	    if (!is_array($ADAT['nevsor']['nevek'][$_diakId])) {
+		$EXTRA = $ADAT['hazifeladatDiak'][$i];
+		$ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>true);
+	    }
+	}
+
 	if (is_array($ADAT['nevsor']['nevek']))
 	foreach ($ADAT['nevsor']['nevek'] as $diakId => $ITEM) {
 	    $D = $DIAKHF[$diakId];
+	    $_extraClass = ($ITEM['extra']===true) ? 'extraDiak':'';
 	    echo '<tr>';   
-	    echo '<td class="diakNev diakAdat" data-diakid="'.$diakId.'">'.$ITEM['diakNev'].'</td>';
+	    echo '<td class="diakNev diakAdat '.$_extraClass.'" data-diakid="'.$diakId.'">'.$ITEM['diakNev'].'</td>';
 	    if (__NAPLOADMIN===true || __VEZETOSEG===true) echo '<td>'.$D['diakLattamDt'].'</td>';
 	    echo '<td colspan="1" class="'.ekezettelen($D['hazifeladatDiakStatus']).'">'.$D['hazifeladatDiakStatus'].'</td>';
 	    //echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 432cde09..209cee31 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4646
+4647
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index fe92affd..510e0f39 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4646
-ebb35417a13f1d3ca611030256dc53dc  mayor-fenntarto-rev4646.tgz
-f928b55f1f2812aad961e91bd15b83f3  mayor-installer-sulix-rev4646.tgz
-ac834d79ee8faaf09af15e9753e39967  mayor-wiki-rev4646.tgz
-48c0acd54dbc6c49219c1e6219d63d31  mayor-installer-rev4646.tgz
-6e1b6103616ac8595c6f529845cd51ea  mayor-portal-rev4646.tgz
-cdb74cd9e35df127608830e829cb3a53  mayor-felveteli-rev4646.tgz
-3d18adcd4647b8f82adbda6bf9e671c7  mayor-jatek-rev4646.tgz
-00f525d935bf0317bc39ae0c47ed4d0d  mayor-locales-jp_JP-rev4646.tgz
-d47203fe463e09468d3a891191b306db  mayor-locales-de_DE-rev4646.tgz
-63f29492349230b00a9aa1e5a44e9934  mayor-locales-en_US-rev4646.tgz
-ab798136849abe56af0f79334800e949  mayor-naplo-rev4646.tgz
-db099677c69ea7fecd9ee00326a6abdd  mayor-base-rev4646.tgz
+Revision 4647
+28aae561159bae08231a8bdfa1adc4a8  mayor-fenntarto-rev4647.tgz
+af5371068e83f16a2dea96e40091bd09  mayor-installer-sulix-rev4647.tgz
+7f6ea900870b41377e0778eb63b3764b  mayor-wiki-rev4647.tgz
+958f4377fd5022bfca21b8bdf22463ce  mayor-installer-rev4647.tgz
+cc283744cff986ac603ab6a198c25616  mayor-portal-rev4647.tgz
+61028a9de8e0a140d54361e1dc2f5350  mayor-felveteli-rev4647.tgz
+c6e5dbb918a83ba781baecf75093fd9d  mayor-jatek-rev4647.tgz
+b41417771784a8e5b7e1176e9aefd12a  mayor-locales-jp_JP-rev4647.tgz
+2c0559fb53df9016aed0d03d2beefef8  mayor-locales-de_DE-rev4647.tgz
+0e5a86267c135b6688fc0525d2b4d371  mayor-locales-en_US-rev4647.tgz
+04fc8fa70dacda0658c6c93e224311cd  mayor-naplo-rev4647.tgz
+219bac9fe1d4269ad176aee6be56629d  mayor-base-rev4647.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 432cde09..209cee31 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4646
+4647
diff --git a/rev.txt b/rev.txt
index 432cde09..209cee31 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4646
+4647
-- 
cgit v1.2.3


From f140bf024b58d159d37a1cf73735cb6afa6da3f3 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Fri, 3 Apr 2020 22:00:03 +0200
Subject: Rev: 4648

---
 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 +-
 .../module-naplo/html/haladasi/hazifeladat.phtml   |  5 +++--
 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 +-
 16 files changed, 30 insertions(+), 29 deletions(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
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 209cee31..31e10e49 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 @@
-4647
+4648
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index 1587f3b0..ffe8a4dd 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -218,16 +218,17 @@ echo '<style type="text/css">
 
 	/* kiegészítjük a tankörnévsort az egyéb diákokkal, akik látták ezt a házifeladatot */
 	for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) {
+	    $_diakId = $ADAT['hazifeladatDiak'][$i]['diakId'];
 	    if (!is_array($ADAT['nevsor']['nevek'][$_diakId])) {
 		$EXTRA = $ADAT['hazifeladatDiak'][$i];
-		$ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>true);
+		$ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
 	    }
 	}
 
 	if (is_array($ADAT['nevsor']['nevek']))
 	foreach ($ADAT['nevsor']['nevek'] as $diakId => $ITEM) {
 	    $D = $DIAKHF[$diakId];
-	    $_extraClass = ($ITEM['extra']===true) ? 'extraDiak':'';
+	    $_extraClass = ($ITEM['extra']=='add') ? 'extraDiak':'';
 	    echo '<tr>';   
 	    echo '<td class="diakNev diakAdat '.$_extraClass.'" data-diakid="'.$diakId.'">'.$ITEM['diakNev'].'</td>';
 	    if (__NAPLOADMIN===true || __VEZETOSEG===true) echo '<td>'.$D['diakLattamDt'].'</td>';
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 209cee31..31e10e49 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4647
+4648
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 510e0f39..84dbf239 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4647
-28aae561159bae08231a8bdfa1adc4a8  mayor-fenntarto-rev4647.tgz
-af5371068e83f16a2dea96e40091bd09  mayor-installer-sulix-rev4647.tgz
-7f6ea900870b41377e0778eb63b3764b  mayor-wiki-rev4647.tgz
-958f4377fd5022bfca21b8bdf22463ce  mayor-installer-rev4647.tgz
-cc283744cff986ac603ab6a198c25616  mayor-portal-rev4647.tgz
-61028a9de8e0a140d54361e1dc2f5350  mayor-felveteli-rev4647.tgz
-c6e5dbb918a83ba781baecf75093fd9d  mayor-jatek-rev4647.tgz
-b41417771784a8e5b7e1176e9aefd12a  mayor-locales-jp_JP-rev4647.tgz
-2c0559fb53df9016aed0d03d2beefef8  mayor-locales-de_DE-rev4647.tgz
-0e5a86267c135b6688fc0525d2b4d371  mayor-locales-en_US-rev4647.tgz
-04fc8fa70dacda0658c6c93e224311cd  mayor-naplo-rev4647.tgz
-219bac9fe1d4269ad176aee6be56629d  mayor-base-rev4647.tgz
+Revision 4648
+d086af10898e4db86ad58a6f6a8cb9e1  mayor-fenntarto-rev4648.tgz
+68a39470addacc9872dfa0b78e77f505  mayor-installer-sulix-rev4648.tgz
+8e32bd80c182fd8edc2205fb695162ac  mayor-wiki-rev4648.tgz
+7ff385259871d1e1de7be26631713fe1  mayor-installer-rev4648.tgz
+967b10bb174eb12bb916101dfed22e5e  mayor-portal-rev4648.tgz
+e0cf0c0cd9a42caedebba2b088254ef5  mayor-felveteli-rev4648.tgz
+542c478343092580f6bc08cef4e61a44  mayor-jatek-rev4648.tgz
+02f71a4be04a6c451117f4f72db05567  mayor-locales-jp_JP-rev4648.tgz
+40130350f09899f27b7ed0a03a1697fd  mayor-locales-de_DE-rev4648.tgz
+b9ffaed9f2964c007bcfaed56332c7d1  mayor-locales-en_US-rev4648.tgz
+7e1f7b7eb79e843e902e89785cc564e4  mayor-naplo-rev4648.tgz
+e8f59df1952886bfbc3beef2dcdc3564  mayor-base-rev4648.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 209cee31..31e10e49 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4647
+4648
diff --git a/rev.txt b/rev.txt
index 209cee31..31e10e49 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4647
+4648
-- 
cgit v1.2.3


From 8c9ffb12892161e5a0fc12c97aa0c8d90f99eb6c Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sat, 4 Apr 2020 12:40:03 +0200
Subject: Rev: 4649

---
 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 +-
 .../include/modules/naplo/share/oraModifier.php    | 31 +++++++++++++++++++---
 .../module-naplo/html/haladasi/hazifeladat.phtml   |  4 ++-
 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, 58 insertions(+), 31 deletions(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
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 31e10e49..1aa1538a 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 @@
-4648
+4649
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
index 8c5bd077..625b6b13 100644
--- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
+++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php
@@ -164,12 +164,37 @@
         	$diakId=__SZULODIAKID;
     	    }
     	    if ($diakId>0) {
-        	$q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())";
-        	$values = array($hazifeladatId, $diakId);
-        	db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values));
+		if (diakSajatHazifeladatE($hazifeladatId)) {
+        	    $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())";
+        	    $values = array($hazifeladatId, $diakId);
+        	    db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values));
+		}
 	    }
 	}
     }
 
+    function diakSajatHazifeladatE($hazifeladatId) { 
+	$sajat = false;
+	if (__DIAK===true && $hazifeladatId>0) {
+    	    if (defined('__USERDIAKID') && __USERDIAKID>0) {
+    	        $diakId=__USERDIAKID;
+    	    } elseif (defined('__SZULODIAKID') && __SZULODIAKID>0) {
+        	$diakId=__SZULODIAKID;
+    	    }
+    	    if ($diakId>0) {
+
+		$q = "SELECT tankorId,dt AS oraDt FROM oraHazifeladat LEFT JOIN ora USING (oraId) WHERE hazifeladatId=%u";
+		$values = array($hazifeladatId);
+        	$ORA = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'record','values'=>$values));
+		
+		$dt = $ORA['oraDt'];
+		$tankorId = $ORA['tankorId'];
+		$diakTankorIds = getTankorIdsByDiakIds(array($diakId), array('tanev' => __TANEV,'tolDt'=>$dt,'igDt'=>$dt,'felmentettekkel'=>true));
+
+		if (in_array($tankorId,$diakTankorIds)) $sajat = true;
+	    }
+	}
+	return $sajat;
+    }
 
 ?>
\ No newline at end of file
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
index ffe8a4dd..419fbc49 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -221,7 +221,9 @@ echo '<style type="text/css">
 	    $_diakId = $ADAT['hazifeladatDiak'][$i]['diakId'];
 	    if (!is_array($ADAT['nevsor']['nevek'][$_diakId])) {
 		$EXTRA = $ADAT['hazifeladatDiak'][$i];
-		$ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
+		if ($EXTRA['hazifeladatDiakStatus']!='') { // csak akkor rakjuk be a névsorba, ha késznek jelölte a diák
+		    $ADAT['nevsor']['nevek'][$EXTRA['diakId']] = array('diakId'=>$ADAT['hazifeladatDiak'][$i]['diakId'],'diakNev'=>$EXTRA['diakNev'],'extra'=>'add');
+		}
 	    }
 	}
 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4648
+4649
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 84dbf239..25bb0e93 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4648
-d086af10898e4db86ad58a6f6a8cb9e1  mayor-fenntarto-rev4648.tgz
-68a39470addacc9872dfa0b78e77f505  mayor-installer-sulix-rev4648.tgz
-8e32bd80c182fd8edc2205fb695162ac  mayor-wiki-rev4648.tgz
-7ff385259871d1e1de7be26631713fe1  mayor-installer-rev4648.tgz
-967b10bb174eb12bb916101dfed22e5e  mayor-portal-rev4648.tgz
-e0cf0c0cd9a42caedebba2b088254ef5  mayor-felveteli-rev4648.tgz
-542c478343092580f6bc08cef4e61a44  mayor-jatek-rev4648.tgz
-02f71a4be04a6c451117f4f72db05567  mayor-locales-jp_JP-rev4648.tgz
-40130350f09899f27b7ed0a03a1697fd  mayor-locales-de_DE-rev4648.tgz
-b9ffaed9f2964c007bcfaed56332c7d1  mayor-locales-en_US-rev4648.tgz
-7e1f7b7eb79e843e902e89785cc564e4  mayor-naplo-rev4648.tgz
-e8f59df1952886bfbc3beef2dcdc3564  mayor-base-rev4648.tgz
+Revision 4649
+709e72ec09b32363f51856e1ca499094  mayor-fenntarto-rev4649.tgz
+07033ea928d45c0754d1fb15aab497c3  mayor-installer-sulix-rev4649.tgz
+d1c3b64425a318308663d4959a442034  mayor-wiki-rev4649.tgz
+f41fb6a773a2de9c4e666886193a7908  mayor-installer-rev4649.tgz
+630c89f1e34b006dbeb5b4a2c3926495  mayor-portal-rev4649.tgz
+d3b29786c697c6a49cdec14d3ac7c8ed  mayor-felveteli-rev4649.tgz
+75dbc2bb9e099d7783d5792897eccd1b  mayor-jatek-rev4649.tgz
+94ea3091ec60b8413bd1eb9f065224ba  mayor-locales-jp_JP-rev4649.tgz
+e452e9124ae788622702ac9e191ffb49  mayor-locales-de_DE-rev4649.tgz
+7b6b5b01836a8012ac87245f65ce80fc  mayor-locales-en_US-rev4649.tgz
+a1911715cb2311bcadde0b3ffa13251c  mayor-naplo-rev4649.tgz
+cd7088e0524d8eeafbb47e84c47cafab  mayor-base-rev4649.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 31e10e49..1aa1538a 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4648
+4649
diff --git a/rev.txt b/rev.txt
index 31e10e49..1aa1538a 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4648
+4649
-- 
cgit v1.2.3


From df9e6d7a1ef747e2207bc2e18b96fca06cbef8f8 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Sat, 4 Apr 2020 12:50:03 +0200
Subject: Rev: 4650

---
 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 +-
 .../module-naplo/css/haladasi/hazifeladat.css      |  4 ++--
 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 +-
 16 files changed, 29 insertions(+), 29 deletions(-)

(limited to 'mayor-orig/mayor-locales-en_US/log')

diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4649
+4650
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 1aa1538a..c3502533 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 @@
-4649
+4650
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4649
+4650
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 1aa1538a..c3502533 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 @@
-4649
+4650
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 1aa1538a..c3502533 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 @@
-4649
+4650
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 1aa1538a..c3502533 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 @@
-4649
+4650
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
index 69a72375..448364ef 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css
@@ -60,9 +60,9 @@
     table.hazifeladatDiak tbody tr td { background-color: white; font-weight:normal; padding: 2px 4px;}
 
 
-    table.hazifeladatDiak tr td a, fieldset.adatok a { color: black; }
+    table.hazifeladatDiak tr td a, fieldset.adatok a { color: cornflowerblue; text-decoration: underline; }
     table.hazifeladatDiak tr td a:visited, fieldset.adatok a:visited { color: #888; }
-    table.hazifeladatDiak tr td a:hover, fieldset.adatok a:hover { text-decoration:underline; color: cornflowerblue; }
+    table.hazifeladatDiak tr td a:hover, fieldset.adatok a:hover { font-style:italic; }
     
     table.hazifeladatDiak tr td.kesz { background-color: lightgreen; color:white; text-align:center }
 
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 1aa1538a..c3502533 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4649
+4650
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 25bb0e93..c04a69e0 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4649
-709e72ec09b32363f51856e1ca499094  mayor-fenntarto-rev4649.tgz
-07033ea928d45c0754d1fb15aab497c3  mayor-installer-sulix-rev4649.tgz
-d1c3b64425a318308663d4959a442034  mayor-wiki-rev4649.tgz
-f41fb6a773a2de9c4e666886193a7908  mayor-installer-rev4649.tgz
-630c89f1e34b006dbeb5b4a2c3926495  mayor-portal-rev4649.tgz
-d3b29786c697c6a49cdec14d3ac7c8ed  mayor-felveteli-rev4649.tgz
-75dbc2bb9e099d7783d5792897eccd1b  mayor-jatek-rev4649.tgz
-94ea3091ec60b8413bd1eb9f065224ba  mayor-locales-jp_JP-rev4649.tgz
-e452e9124ae788622702ac9e191ffb49  mayor-locales-de_DE-rev4649.tgz
-7b6b5b01836a8012ac87245f65ce80fc  mayor-locales-en_US-rev4649.tgz
-a1911715cb2311bcadde0b3ffa13251c  mayor-naplo-rev4649.tgz
-cd7088e0524d8eeafbb47e84c47cafab  mayor-base-rev4649.tgz
+Revision 4650
+4eda8135c65e26004c1f0d40dfa235cd  mayor-fenntarto-rev4650.tgz
+517f4a0c830c9dab5befd5d31e03093e  mayor-installer-sulix-rev4650.tgz
+c63fe7228c2fdc77222915d4c006c5cf  mayor-wiki-rev4650.tgz
+c88fb59096f25b7c669c0ba03c25ea21  mayor-installer-rev4650.tgz
+d3ea52265ab983fd52edee8133b1756f  mayor-portal-rev4650.tgz
+a07e2d33b60791f8c7c7d74dfeb9fc9b  mayor-felveteli-rev4650.tgz
+b07abd2c94b51f8ea8a912767fbc734e  mayor-jatek-rev4650.tgz
+46595bb11e3516ba70f8aaadb1266fa0  mayor-locales-jp_JP-rev4650.tgz
+f43f7a2a609c4b69c60c4c6a75f6cdf5  mayor-locales-de_DE-rev4650.tgz
+429e86a69172156749d5caa0b7830559  mayor-locales-en_US-rev4650.tgz
+13becad78ba9949266fc0821a4fae71c  mayor-naplo-rev4650.tgz
+b6da5c1ec34c6636b570e086721ea2b2  mayor-base-rev4650.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 1aa1538a..c3502533 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4649
+4650
diff --git a/rev.txt b/rev.txt
index 1aa1538a..c3502533 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4649
+4650
-- 
cgit v1.2.3