diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin')
4 files changed, 86 insertions, 8 deletions
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 new file mode 100644 index 00000000..1cce1e3e --- /dev/null +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/hazifeladat.css @@ -0,0 +1,31 @@ + + fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;} + fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; } + + fieldset.adatok.kesz legend { background-color:lightgreen} + + form button.btnHfStatusz { + background-color: #eee; + border-radius: 2px; + border: solid 1px #888; + color: #888; + padding:2px 18px 2px 4px; + } + form button.btnHfStatusz span { color:#eee; } + form button.btnHfStatusz.kesz span { color: lightgreen; } + + form button.btnHfStatusz:hover { + background-color:lightgreen; + color:black; + border-color:black; + } + form button.btnHfStatusz.kesz:hover { + background-color: orange; + } + form button.btnHfStatusz:hover span { color: white; } + + form button.btnHfStatusz.kesz:hover span { color: orange } + + table.hazifeladatDiak { margin:auto; background-color: #eee;} + table.hazifeladatDiak thead tr th { background-color: #4caf50; color:white; font-weight:normal;} + table.hazifeladatDiak tbody tr td { background-color: white; font-weight:normal; padding: 2px 4px;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml index 3c36e9f2..e267cf27 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml @@ -528,7 +528,12 @@ } echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">'; if ($dOra['hazifeladatId']>0) { - echo '<span class="icon-home-alt" style="color: #ff5722"></span>'; + if ($ADAT['diakHazifeladat'][$dOra['oraId']]['hazifeladatDiakStatus'] =='kész') { + $hfColor = 'lightgreen'; + } else { + $hfColor = '#ff5722'; + } + echo '<span class="icon-home-alt" style="color: '.$hfColor.'"></span>'; } else { echo '<span class="icon-home" style="color: #aaa"></span>'; } 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 e2b6d3ef..c5a26c13 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 @@ -2,13 +2,13 @@ function putHazifeladat($ADAT) { - echo '<style type="text/css">'; +/* echo '<style type="text/css">'; echo ' fieldset.adatok { margin-bottom:1em; width:80%; margin-left:auto; margin-right:auto; border-radius: 2px; border: solid 1px #ddd;} fieldset.adatok legend { border-radius: 2px; background-color: #ff5722; color:white; padding: 2px 4px; } '; echo '</style>'; - +*/ echo '<fieldset class="adatok"><legend>'._ALAPADATOK.'</legend>'."\n"; echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – <span class="tankorNev" data-tankorid="'.$ADAT['oraId']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span> – '.$ADAT['oraAdat']['kiCn']; @@ -18,19 +18,33 @@ if (__DIAK===true) { + if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') $_class = "kesz"; + + if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n"; if ($ADAT['oraAdat']['leiras']=='') { echo '<p style="color:#aaa;">még nincs kitöltve</p>'; } else { echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; } echo '</fieldset>'."\n"; - echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n"; + echo '<fieldset class="adatok '.$_class.'"><legend>'._HAZIFELADAT.'</legend>'."\n"; if ($ADAT['hazifeladatAdat']['hazifeladatLeiras']=='') { echo '<p style="color:#aaa;">még nincs kitöltve</p>'; } else { echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); } echo '</fieldset>'."\n"; - + if ($ADAT['hazifeladatId']>0) { + echo '<div style="text-align:center; margin-bottom: 140px;">'; + echo '<input type="hidden" name="action" value="hazifeladatKesz">'; + if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') { + echo '<button type="submit" class="btnHfStatusz kesz"><span class="icon-ok-sign"></span> kész</button>'; + } else { + echo '<button type="submit" class="btnHfStatusz"><span class="icon-ok-sign"></span> késznek jelölöm</button>'; + } + echo '</div>'; + } + + echo formEnd(); } else { echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>'; if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); @@ -79,7 +93,35 @@ echo '<input type="submit">'; echo '</fieldset>'."\n"; if ($skin != 'ajax') formEnd(); + + + if (count($ADAT['hazifeladatDiak'])>0) { + echo '<fieldset class="adatok">'; + echo '<legend>Visszajelzések</legend>'; + putHazifeladatDiak($ADAT); + echo '</fieldset>'; + } + } + } + + function putHazifeladatDiak($ADAT) { + + if (count($ADAT['hazifeladatDiak'])==0) return false; + + echo '<table class="hazifeladatDiak" cellpadding="1" cellspacing="1">'; + echo '<thead>'; + echo '<tr><th>diák</th><th>látta</th><th>státusz</th><th></th></tr>'; + echo '</thead>'; + for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) { + $D = $ADAT['hazifeladatDiak'][$i]; + echo '<tr>'; + echo '<td class="diakNev diakAdat" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>'; + echo '<td>'.$D['diakLattamDt'].'</td>'; + echo '<td>'.$D['hazifeladatDiakStatus'].'</td>'; + echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>'; + echo '</tr>'; } + echo '</table>'; } ?> diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml index 0aba3072..c04cd9ec 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml @@ -262,11 +262,12 @@ $_hianyzasClass = (is_array($_hianyzasAdat) && $_hianyzasAdat['hTipus']=='hiányzás') ? ' nemVoltBent ':''; echo '<div class="'.$_tipusClass.$_frissClass.$_oraMostVanClass.$_utolsooraClass.$_hianyzasClass.' '.$_oraAdat.'" data-oraid="'.$_ORA['oraId'].'" title="'.$_ORA['tipus'].'" >'; if (isset($_ORA['hazifeladatId'])) { - echo '<span class="icon-home-alt" title="h.f." style="color:#e91e63; padding-right:2px;"></span>'; + if ($_ORA['diakHazifeladat']['hazifeladatDiakStatus'] == 'kész') $_hfcolor = 'lightgreen'; + else $_hfcolor = '#e91e63'; + echo '<span class="icon-home-alt" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>'; } if (is_array($_hianyzasAdat)) { - echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">'; if ($_hianyzasAdat['hTipus']=='hiányzás') echo '<span class="icon-hearing-impaired"></span>'; @@ -336,7 +337,6 @@ if (MAYOR_SOCIAL === true) { if (in_array($_tankorTipus,array('délutáni','tanórán kívüli'))) { echo ' ¹'; } - echo '</div>'; if (count($T[$nap][$ora]['orak'])>$i+1) //echo '<hr />'; |