Rev: 4712rev4712

4 files changed, 17 insertions, 3 deletions

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 86ca57a0..a973e454 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
@@ -80,7 +80,8 @@
 	}
 	if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) {
 	    $leiras = readVariable($_POST['oraLeiras'],'string');
-	    updateHaladasiNaploOra($oraId, $leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'],'string');
+	    updateHaladasiNaploOra($oraId, $leiras, $cimkeId);
 	}
     } elseif (__TANAR===true && $action=='lattam') {
 	$lr = db_connect('naplo');
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
index 064bc796..308e7b4f 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/tools/getOraAdat-pre.php
@@ -25,7 +25,8 @@
 	$dolgozatBeirhato = $oraBeirhato;
 	if ($oraBeirhato===true && $action=='oraBeiras') {
 	    $leiras = readVariable($_POST['leiras'], 'string');
-	    updateHaladasiNaploOra($oraId,$leiras);
+	    $cimkeId = readVariable($_POST['cimkeId'], 'id');
+	    updateHaladasiNaploOra($oraId,$leiras,$cimkeId);
 	}
 	$_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId);
 	if ($ORAADAT['hazifeladatId']>0) {
@@ -56,6 +57,7 @@
 	        <input class="mayorToken" type="hidden" name="mayorToken" value="'.$_SESSION['mayorToken'].'" />
 	        <input type="hidden" name="action" value="oraBeiras" />
 	        <input type="hidden" name="oraId" value="'.$oraId.'" />
+	        <input type="hidden" name="cimkeId" value="'.$_JSON['oraAdat']['cimkeId'].'" />
 	        <textarea name="leiras" style="margin-top:8px; width:99%; height:100px;">'. supertext($_JSON['oraAdat']['leiras']).'</textarea>';
 	    $oraForm .= '<button type="button" class="setOraAdat mentes" value="mentés" data-oraid="'.$oraId.'"><span class="icon-ok"></span> MENTÉS </button>';
 	    $oraForm .= '</form>';
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 f12a5b14..c88905c2 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
@@ -251,6 +251,13 @@
     div.arckepContainer.szulo span {background-color: #40e0d0; }
     div.arckepContainer.diak span {background-color: #6495ed; }
 
+    span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px;  background-color:#ddd; }
+    span.cimke_0 { background-color: #4caf50; }
+    span.cimke_1 { background-color: red; }
+    span.cimke_2 { background-color: orange; }
+    span.cimke_3 { background-color: #3f51b5; }
+    span.cimke_4 { background-color: #673ab7; }
+
 @media (max-width: 764px) {
 
     #toolBarTitle {display:;}
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 419fbc49..dd9c3687 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
@@ -8,8 +8,11 @@
 	    echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA;
 	    echo '</span>';
 	    echo ' – <span class="tankorNev tankorAdat" data-tankorid="'.$ADAT['oraAdat']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span>';
+	    if ($ADAT['oraAdat']['cimkeLeiras']!='') {
+		echo ' – '.'<span class="cimke cimke_'.(intval($ADAT['oraAdat']['cimkeId'])%5).'">'.$ADAT['oraAdat']['cimkeLeiras'].'</span>';
+	    }
 	    echo ' – <span class="tanarNev" data-tanarid="'.$ADAT['oraAdat']['ki'].'">'.$ADAT['oraAdat']['kiCn'].'</span>';
-	    // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>';
+
 
 	echo '</fieldset>'."\n";
 
@@ -124,6 +127,7 @@ echo '<style type="text/css">
 	    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="cimkeId" value="'.$ADAT['oraAdat']['cimkeId'].'"/>';
 	    echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>';
 
 	    echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n";