diff options
Diffstat (limited to 'mayor-orig/mayor-naplo')
3 files changed, 15 insertions, 2 deletions
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>'; |