Rev: 4620rev4620

5 files changed, 74 insertions, 3 deletions

diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
index 849a5afe..8f26e848 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/naplo.css
@@ -214,7 +214,7 @@
 
 /*    #updateWindowSide h3:before { font-family: 'Elusive-Icons'; font-size:10px; content: "\e0a4"; padding-right:8px;font-weight:100; }*/
 
-    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #ddd;}
+    .updateWindowSide button.mentes,    .updateWindowSide button.torles  { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #2196f3;}
     .updateWindowSide button.mentes:hover { background-color: lightgreen; }
     .updateWindowSide button.torles:hover { background-color: red; }
 
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 27eb51f1..e6377aeb 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
@@ -433,6 +433,7 @@
 			    echo '</span>';
 			}
 			echo '<input type="hidden" name="tanmenetIdContainer[]" value="'.$ADAT['tankorTanmenet'][ $dOra['tankorId'] ].'" />'."\n";
+			echo '<input type="hidden" name="hazifeladatIdContainer[]" value="'.$ADAT['tankorHazifeladat'][ $dOra['tankorId'] ].'" />'."\n";
 			echo '<input type="hidden" name="tankorIdContainer[]" value="'.$dOra['tankorId'].'" />'."\n";
 		// -------------------------------------------------------------------------	
 	    echo '</td>'."\n";
@@ -485,7 +486,6 @@
 		    echo $dOra['oraszam'];
 		    echo '</a>';
 
-
 		} else { // itt kiírhatjuk a heti terhelését
 		    //echo '<span style="color: purple;" title="a típusból ezen a héten összesen">eheti:'.($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']-$SZLO[$dOra['feladatTipusId']])."/".($ADAT['oraTerheles'][$dOra['feladatTipusId']]['db']).'</span>';
 		    //echo '<span style="color: purple;" title="a típusból ezen a héten összesen">eheti:'.($SZLO['sum']-$SZLO['sum_c'])."/".($SZLO['sum']).'</span>';
@@ -514,6 +514,16 @@
 		    if (count($_C)>0) echo '<span class="cimke">'.implode('</span> <span class="cimke">',$_C).'</span>';
 		  }
 		}
+		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>';
+		    } else {
+			echo '<span class="icon-home" style="color: #aaa"></span>';
+		    }
+		echo '</a>';
+
+
+
 	    echo '</td>';
 	    // ----- Leírás ---------------------------------
 		if ($modosithatoOra) {
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
new file mode 100644
index 00000000..acf8fcae
--- /dev/null
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/hazifeladat.phtml
@@ -0,0 +1,47 @@
+<?php
+
+    function putHazifeladat($ADAT) {
+
+	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 superdate($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'];
+
+	    echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
+	echo '</fieldset>'."\n";
+
+	if (__DIAK===true) {
+
+	    echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+		echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']);
+	    echo '</fieldset>'."\n";
+
+	} else {
+	    echo '<script src="//cdn.ckeditor.com/4.14.0/basic/ckeditor.js"></script>';
+	    if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat'));
+	    echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>';
+	    echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>';
+	    echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
+
+	    echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n";
+	    echo '<textarea name="hazifeladatLeiras" class="wysiwyg" rows="10" cols="80" style="width:100%">';
+		echo htmlspecialchars($ADAT['hazifeladatAdat']['hazifeladatLeiras']);
+	    echo '</textarea>';
+	    echo "
+                <script>
+                        CKEDITOR.replace( 'hazifeladatLeiras' );
+                </script>";
+	    echo '<input type="submit">';
+	    echo '</fieldset>'."\n";
+	    if ($skin != 'ajax') formEnd();
+	}
+    }
+
+?>
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 f8b8d393..0aba3072 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
@@ -234,7 +234,6 @@
 				    //
 				    $het = $_T['het'];
 				    $_ORA = $ADAT['haladasi']['orak'][$dt][$ora][$_T['tankorId']]; 
-
 				    $_valosTeremId = (is_null($_ORA['teremId']))? $_T['teremId']:$_ORA['teremId'];
 
 				    $_tankorTipus = $ADAT['tankorok'][$_T['tankorId']][0]['tankorTipus'];
@@ -262,8 +261,12 @@
 				    $_hianyzasAdat =  $ADAT['hianyzas'][$_ORA['oraId']][0];
 				    $_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 (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>';
diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
index c57e142e..251155a1 100644
--- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
+++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/naplo.jquery.min.js
@@ -698,6 +698,7 @@ processJSONOraAdat = function(adat) {
 	content += '<div id="mayorNaviIconHolder">';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'haladasi','f':'haladasi','tanarId':adat['oraAdat']['ki'],'tankorId':adat['oraAdat']['tankorId']})+'"><span class="icon-file-edit-alt"></span><br/>Haladási</a></div>';
 	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'hianyzas','f':'ora','oraId':adat['oraId']})+'"><span class="icon-calendar-sign"></span><br/>Hiányzások</a></div>';
+	content += '<div class="mayorNaviIcon"><a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-home-alt"></span><br/>Házi feladat</a></div>';
 	content += '</div>';
 
 	content += '<h3>A haladási óra adatai</h3>';	
@@ -731,6 +732,16 @@ processJSONOraAdat = function(adat) {
 	if (adat['dolgozatBeirhato']) {
 		content += adat['dolgozatForm'];
 	}
+
+
+	content += '<h3>Házi feladat ';
+	content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-home-alt"></span></a>';
+	content += '</h3>';
+	if (adat['oraAdat']['hazifeladatId']>0) {
+	    content += '<div style="border: solid 1px #999">';
+	    content += adat['oraAdat']['hazifeladatLeiras'];
+	    content += '</div>';
+	}
 	if (adat['elozoOrak']!=undefined && adat['elozoOrak'].length>0) {
 	    content += '<h3>Előző órák</h3>';
 	    content += '<ul>';