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 +-
 16 files changed, 40 insertions(+), 27 deletions(-)

(limited to 'mayor-orig')

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
-- 
cgit v1.2.3