From eba77eabc9b033ef3b904eec7737bc997db37596 Mon Sep 17 00:00:00 2001
From: M.Gergo
Date: Wed, 25 Nov 2020 13:30:04 +0100
Subject: Rev: 4712
---
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 +-
.../private/naplo/haladasi/hazifeladat-pre.php | 3 ++-
.../policy/private/naplo/tools/getOraAdat-pre.php | 4 +++-
.../www/skin/classic/module-naplo/css/naplo.css | 7 ++++++
.../module-naplo/html/haladasi/hazifeladat.phtml | 6 ++++-
.../install/mayor-portal/mysql/mayor-portal.sql | 2 +-
mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +-
.../update/rev004710-1-mayor_portal.sql | 12 ++++++++++
mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +-
mayor-orig/md5sum | 26 +++++++++++-----------
mayor-orig/rev.txt | 2 +-
rev.txt | 2 +-
21 files changed, 57 insertions(+), 31 deletions(-)
create mode 100644 mayor-orig/mayor-portal/update/rev004710-1-mayor_portal.sql
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4710
+4712
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
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 de4ba040..acbf96c3 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 @@
-4710
+4712
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index de4ba040..acbf96c3 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4710
+4712
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 @@
+
';
$oraForm .= '';
$oraForm .= '';
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 '';
echo ' – '.$ADAT['oraAdat']['tankorNev'].'';
+ if ($ADAT['oraAdat']['cimkeLeiras']!='') {
+ echo ' – '.''.$ADAT['oraAdat']['cimkeLeiras'].'';
+ }
echo ' – '.$ADAT['oraAdat']['kiCn'].'';
- // echo ''.$ADAT['oraAdat']['leiras'].'
';
+
echo ''."\n";
@@ -124,6 +127,7 @@ echo '