From 108cd360416fab309c0d91e26187c5d51dc1f8d7 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 26 Mar 2020 17:25:03 +0100 Subject: Rev: 4639 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- mayor-orig/mayor-base/www/include/share/net/upload.php | 15 +++++++++++++++ 2 files changed, 16 insertions(+), 1 deletion(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 7ea43f6c..d464190f 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4638 +4639 diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index d58708ed..4aea8b8a 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -49,12 +49,27 @@ try { // You should name it uniquely. // DO NOT USE $_FILES['upfile']['name'] WITHOUT ANY VALIDATION !! // On this example, obtain safe unique name from its binary data. + + // define('CLAMAV_ENABLED',true); + if (CLAMAV_ENABLED === true) { + $safePath = escapeshellarg($_FILES['upfile']['tmp_name']); + $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove --log='/var/mayor/log/clamdscan.log'"; // --remove + $out = ''; + $int = -1; + exec($command, $out, $int); + if ($int!==0) { + if (file_exists($safePath)) unlink($safePath); + throw new RuntimeException('Szerintünk ez vírusos!!!'); + } + } + if (!move_uploaded_file($_FILES['upfile']['tmp_name'],$ADAT['subdir'].'/'.$ADAT['filename'])) { throw new RuntimeException('Nem tudtuk átmozgatni. Van jogunk írni a célkönyvtárba?'); } } catch (RuntimeException $e) { $_SESSION['alert'][] = 'info::'.$e->getMessage(); + return false; } return true; -- cgit v1.2.3 From d2c82a8367b63d0a51fb4d3a322e5e83c06874c9 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Thu, 26 Mar 2020 17:50:04 +0100 Subject: Rev: 4640 --- mayor-orig/mayor-base/log/mayor-base.rev | 2 +- .../mayor-base/www/include/share/net/upload.php | 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 +- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 16 files changed, 28 insertions(+), 28 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-base/www/include/share/net/upload.php b/mayor-orig/mayor-base/www/include/share/net/upload.php index 4aea8b8a..0d50d34e 100644 --- a/mayor-orig/mayor-base/www/include/share/net/upload.php +++ b/mayor-orig/mayor-base/www/include/share/net/upload.php @@ -53,7 +53,7 @@ try { // define('CLAMAV_ENABLED',true); if (CLAMAV_ENABLED === true) { $safePath = escapeshellarg($_FILES['upfile']['tmp_name']); - $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove --log='/var/mayor/log/clamdscan.log'"; // --remove + $command = "clamdscan --quiet --stdout --fdpass ".$safePath." --remove"; // --remove $out = ''; $int = -1; exec($command, $out, $int); diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 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 d464190f..f201ebe0 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 @@ -4639 +4640 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index d464190f..f201ebe0 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4639 +4640 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 3406c508..a29c6989 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4639 -2d41c52f4016d1be10f4dce40ed0b93f mayor-fenntarto-rev4639.tgz -c9478de2ea95c1be83ff1e0b62e2f551 mayor-installer-sulix-rev4639.tgz -942b1ae2d0c7b63e733f7a1adbbaa0fa mayor-wiki-rev4639.tgz -cc9376be722d81207bbfa23c89fabe89 mayor-installer-rev4639.tgz -26fd8ce3ecef39bf4ee8551cd7876fbb mayor-portal-rev4639.tgz -a1908da04c7df9f409d1b744a59bdf95 mayor-felveteli-rev4639.tgz -e5bc861e6b379dcbcfb091e92b7b47f8 mayor-jatek-rev4639.tgz -a880b62b6fce28e75dc04926cec94cb7 mayor-locales-jp_JP-rev4639.tgz -f0c9d72a8997e39688dafcde61a3bc64 mayor-locales-de_DE-rev4639.tgz -518c80ceee91124cdc30dcce46734cd9 mayor-locales-en_US-rev4639.tgz -3e36f7e5a3f044eaf359b5c93e7e4c53 mayor-naplo-rev4639.tgz -39a23ad8b33e5c5f9b9c036831f8171c mayor-base-rev4639.tgz +Revision 4640 +b51060c311067404ac189cad6cace9b7 mayor-fenntarto-rev4640.tgz +cddc7e2f50f0488aafbecfde00f85221 mayor-installer-sulix-rev4640.tgz +a497bc01ef299e59fd3ee697a5587d9b mayor-wiki-rev4640.tgz +83a6acdac73692b2f682b454e08b3c17 mayor-installer-rev4640.tgz +5ebfe1aab6a41b565c217d9286522560 mayor-portal-rev4640.tgz +d70c7ff14d8a857d4f214289fe9864cd mayor-felveteli-rev4640.tgz +634acc85bd9fbfeae1af698539e67124 mayor-jatek-rev4640.tgz +e73a9088ced43dcb8710190f487eb7e3 mayor-locales-jp_JP-rev4640.tgz +c294db378132eb75cea51997581ebd07 mayor-locales-de_DE-rev4640.tgz +6f14ab873b407d1d97348895c5ef8a2e mayor-locales-en_US-rev4640.tgz +c217cd9212716e3d3de34ffb930db72e mayor-naplo-rev4640.tgz +a1459d17b6ac376e21051b4009263c9b mayor-base-rev4640.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index d464190f..f201ebe0 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4639 +4640 diff --git a/rev.txt b/rev.txt index d464190f..f201ebe0 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4639 +4640 -- cgit v1.2.3 From 84cd05de4eaba22c158f88564b7941d5f4d70069 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Fri, 27 Mar 2020 17:10:04 +0100 Subject: Rev: 4641 --- 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 +- .../www/include/modules/naplo/share/ora.php | 20 +++++++++++++---- .../classic/module-naplo/css/haladasi/haladasi.css | 7 ++++++ .../classic/module-naplo/css/orarend/orarend.css | 9 ++++++++ .../module-naplo/html/haladasi/haladasi.phtml | 15 ++++++++----- .../module-naplo/html/orarend/orarend.phtml | 5 +++++ mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 20 files changed, 74 insertions(+), 36 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4640 +4641 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 f201ebe0..3f4f4b89 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 @@ -4640 +4641 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4640 +4641 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 f201ebe0..3f4f4b89 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 @@ -4640 +4641 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 f201ebe0..3f4f4b89 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 @@ -4640 +4641 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 f201ebe0..3f4f4b89 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 @@ -4640 +4641 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php index 602f26e1..60ddb4fa 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php @@ -24,16 +24,20 @@ tankorNev, feladatTipusId, munkaido, - hazifeladatId, hazifeladatLeiras + hazifeladatId, + hazifeladatLeiras, + cimkeId, cimkeLeiras FROM `%s`.ora LEFT JOIN `%s`.oraHazifeladat USING (oraId) + LEFT JOIN `%s`.oraCimke USING (oraId) + LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId) LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE oraId=%u AND (tanev=%u OR feladatTipusId IS NOT NULL)"; - $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); + $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); return db_query($q, array('fv' => 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr); } else { @@ -349,6 +353,8 @@ } else { $q = "SELECT * FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId); if ($SET['result']=='assoc') @@ -389,13 +395,19 @@ WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); } else { if ($SET['elmaradokNelkul']) - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") AND tipus NOT IN ('elmarad','elmarad máskor')"; else - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")"; $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); $RE['tankorok']=array(); diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css index 4477f75c..b4449090 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css @@ -316,6 +316,13 @@ td.cimke { text-align:center; white-space: wrap; background-color: rgba(255,255,255,0.3);} td.cimke span.cimke {background-color: orange; color:white; font-size:x-small; padding:0px 2px; border-radius: 2px; margin:2px;} + td.cimke span.cimke_0 { background-color: #4caf50; } + td.cimke span.cimke_1 { background-color: red; } + td.cimke span.cimke_2 { background-color: orange; } + td.cimke span.cimke_3 { background-color: #3f51b5; } + td.cimke span.cimke_4 { background-color: #673ab7; } + + } @media print { table.haladasiBejegyzesek thead tr th { border-bottom: solid 1px black;} diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css index fab07933..836e0ee2 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css @@ -207,6 +207,15 @@ div.unfinished { table.orarend div.orarendTools span.dolgozat:hover { color: orange;} table.orarend div.orarendTools span.bezar:hover { color: #f06; } + table.orarend span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px; background-color:#ddd; } + table.orarend span.cimke_0 { background-color: #4caf50; } + table.orarend span.cimke_1 { background-color: red; } + table.orarend span.cimke_2 { background-color: orange; } + table.orarend span.cimke_3 { background-color: #3f51b5; } + table.orarend span.cimke_4 { background-color: #673ab7; } + + + h2.mayorSocialEdition { text-align: center; background-color: #f06; 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 ce15cd4d..fa46ad2c 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 @@ -53,7 +53,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo ''; - echo ''; + echo ''; if ($tanarId!='') { echo ''.$title.''; if ($ADAT['csakUres']==true) { @@ -106,7 +106,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo ''; - echo ''; + echo ''; // if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo ''."\n"; if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo ''; @@ -197,7 +197,7 @@ if (__PLUSZBEIRHAT===true && !$jovoDt) echo '
'; echo ''."\n"; // Az első cella a dátum/nap - echo ''; + echo ''; echo str_replace('-','.',$dt) .'. '; echo ''.$aHetNapjai[(date('w',$time)+6)%7].''; if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) { @@ -237,7 +237,7 @@ if (__PLUSZBEIRHAT===true) putUjOra(array('dt'=>$dt, 'ora'=>$j)); } } else { - echo ''._NINCS_ORAJA.''; + echo ''._NINCS_ORAJA.''; // if ($tanitasiNap && strtotime(date('Y-m-d'))>=strtotime($dt)) { // if ( // (strtotime(date('Y-m-d'))>=strtotime($dt) @@ -523,9 +523,14 @@ for ($c = 0; $c0) echo ''.implode(' ',$_C).''; + if (count($_C)>0) { // vigyázz, csak egy címke engedélyezett! (egyelőre, különben sérül a getHaladasi) + $_cimkeId = $dOra['cimke'][0]; + echo ''.implode(' ',$_C).''; + } } } + echo ''; + echo ''; echo ''; 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 5c75bfb6..77ad0bce 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 @@ -274,6 +274,11 @@ echo ''; } + if ($_ORA['cimkeLeiras']!='') { + $_cimkeMod = intval($_ORA['cimkeId']) % 5; + echo ''.$_ORA['cimkeLeiras'].''; + } + if (is_array($_hianyzasAdat)) { echo ''; if ($_hianyzasAdat['hTipus']=='hiányzás') diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index a29c6989..adaa176a 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4640 -b51060c311067404ac189cad6cace9b7 mayor-fenntarto-rev4640.tgz -cddc7e2f50f0488aafbecfde00f85221 mayor-installer-sulix-rev4640.tgz -a497bc01ef299e59fd3ee697a5587d9b mayor-wiki-rev4640.tgz -83a6acdac73692b2f682b454e08b3c17 mayor-installer-rev4640.tgz -5ebfe1aab6a41b565c217d9286522560 mayor-portal-rev4640.tgz -d70c7ff14d8a857d4f214289fe9864cd mayor-felveteli-rev4640.tgz -634acc85bd9fbfeae1af698539e67124 mayor-jatek-rev4640.tgz -e73a9088ced43dcb8710190f487eb7e3 mayor-locales-jp_JP-rev4640.tgz -c294db378132eb75cea51997581ebd07 mayor-locales-de_DE-rev4640.tgz -6f14ab873b407d1d97348895c5ef8a2e mayor-locales-en_US-rev4640.tgz -c217cd9212716e3d3de34ffb930db72e mayor-naplo-rev4640.tgz -a1459d17b6ac376e21051b4009263c9b mayor-base-rev4640.tgz +Revision 4641 +44d402ba720498fa9854aad8f429f72f mayor-fenntarto-rev4641.tgz +851f5b333b2376ed254ce81436eddfe9 mayor-installer-sulix-rev4641.tgz +a71abc62c249ec0c77acb501a3604b21 mayor-wiki-rev4641.tgz +f1457a281600ccc724490109f33b27b4 mayor-installer-rev4641.tgz +f4417038061794ba5993d980a9feb50a mayor-portal-rev4641.tgz +9b974665458ba4cd3dc77b2eded8eceb mayor-felveteli-rev4641.tgz +b23f9ee726139fc59679fefabd4e055e mayor-jatek-rev4641.tgz +2868255ebd7d7e177882e26e55302069 mayor-locales-jp_JP-rev4641.tgz +89e7fee6921db98077fc68b293b8202f mayor-locales-de_DE-rev4641.tgz +5a182f830d98f9ff8de8954fe2de82d2 mayor-locales-en_US-rev4641.tgz +d7ab17e3bdc7871aaa9cf481a14e979c mayor-naplo-rev4641.tgz +4a2448198c67b5b16268e7c58b11f92b mayor-base-rev4641.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4640 +4641 diff --git a/rev.txt b/rev.txt index f201ebe0..3f4f4b89 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4640 +4641 -- cgit v1.2.3 From 9424baefa25b375a492acca5e7488fb79e76bbb7 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Sat, 28 Mar 2020 00:10:03 +0100 Subject: Rev: 4642 --- 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 +- .../mayor-naplo/update/pre004627-1-naplo.sql | 4 ++-- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 16 files changed, 29 insertions(+), 29 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4641 +4642 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 3f4f4b89..e387cc7f 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 @@ -4641 +4642 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4641 +4642 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 3f4f4b89..e387cc7f 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 @@ -4641 +4642 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 3f4f4b89..e387cc7f 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 @@ -4641 +4642 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 3f4f4b89..e387cc7f 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 @@ -4641 +4642 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql index ba6686cd..d726406b 100644 --- a/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql +++ b/mayor-orig/mayor-naplo/update/pre004627-1-naplo.sql @@ -10,8 +10,8 @@ IF NOT EXISTS ( ) THEN CREATE TABLE `oraHazifeladatDiak` ( - `hazifeladatId` int(10) unsigned DEFAULT NULL, - `diakId` int(10) unsigned DEFAULT NULL, + `hazifeladatId` int(10) unsigned NOT NULL, + `diakId` int(10) unsigned NOT NULL, `diakLattamDt` datetime DEFAULT NULL, `tanarLattamDt` datetime DEFAULT NULL, `hazifeladatDiakStatus` ENUM('','kész') DEFAULT '', diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4641 +4642 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index adaa176a..f60ce0ab 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4641 -44d402ba720498fa9854aad8f429f72f mayor-fenntarto-rev4641.tgz -851f5b333b2376ed254ce81436eddfe9 mayor-installer-sulix-rev4641.tgz -a71abc62c249ec0c77acb501a3604b21 mayor-wiki-rev4641.tgz -f1457a281600ccc724490109f33b27b4 mayor-installer-rev4641.tgz -f4417038061794ba5993d980a9feb50a mayor-portal-rev4641.tgz -9b974665458ba4cd3dc77b2eded8eceb mayor-felveteli-rev4641.tgz -b23f9ee726139fc59679fefabd4e055e mayor-jatek-rev4641.tgz -2868255ebd7d7e177882e26e55302069 mayor-locales-jp_JP-rev4641.tgz -89e7fee6921db98077fc68b293b8202f mayor-locales-de_DE-rev4641.tgz -5a182f830d98f9ff8de8954fe2de82d2 mayor-locales-en_US-rev4641.tgz -d7ab17e3bdc7871aaa9cf481a14e979c mayor-naplo-rev4641.tgz -4a2448198c67b5b16268e7c58b11f92b mayor-base-rev4641.tgz +Revision 4642 +a41d6a896afcbc699ca113dd206a5c22 mayor-fenntarto-rev4642.tgz +4279b8ac06cb7ae7f3ce91872f107b7f mayor-installer-sulix-rev4642.tgz +35556f0254ac535edd802d3bd409ad3f mayor-wiki-rev4642.tgz +0c04c43a6b16746ea18ffd2e58844e0a mayor-installer-rev4642.tgz +457035dc58d489da34bcdda1eef7c1cf mayor-portal-rev4642.tgz +c951c85fd4ca3738a160a6a2dcdd103a mayor-felveteli-rev4642.tgz +6e02e9bf29af5b20eef089f9dd323d0d mayor-jatek-rev4642.tgz +1046f7eddfd9a2cdd78a4371587cf1f9 mayor-locales-jp_JP-rev4642.tgz +9b914f32434afb5453462670ff91d28e mayor-locales-de_DE-rev4642.tgz +735b7bf5c322d7496f09160e23a15570 mayor-locales-en_US-rev4642.tgz +df2ec8d8fae2b2e8feac83fcfa175969 mayor-naplo-rev4642.tgz +82caa6467fec4455ab4ba3fc179f4603 mayor-base-rev4642.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 3f4f4b89..e387cc7f 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4641 +4642 diff --git a/rev.txt b/rev.txt index 3f4f4b89..e387cc7f 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4641 +4642 -- cgit v1.2.3 From b926ebee10ecb9e6bd128cbacb7be6ee62a8c531 Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Mon, 30 Mar 2020 14:35:03 +0200 Subject: Rev: 4643 --- 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 +- .../include/modules/naplo/share/oraModifier.php | 16 +++++++++++++ .../private/naplo/haladasi/hazifeladat-pre.php | 8 ++++--- .../policy/private/naplo/tools/getOraAdat-pre.php | 4 ++++ mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++++++----------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 18 files changed, 52 insertions(+), 30 deletions(-) (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4642 +4643 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 e387cc7f..4fbccb1a 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 @@ -4642 +4643 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4642 +4643 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 e387cc7f..4fbccb1a 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 @@ -4642 +4643 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 e387cc7f..4fbccb1a 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 @@ -4642 +4643 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 e387cc7f..4fbccb1a 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 @@ -4642 +4643 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php index 53b6c763..8c5bd077 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/oraModifier.php @@ -156,4 +156,20 @@ } + function oraHazifeladatDiakLatta($hazifeladatId) { + if (__DIAK===true && $hazifeladatId>0) { + if (defined('__USERDIAKID') && __USERDIAKID>0) { + $diakId=__USERDIAKID; + } elseif (defined('__SZULODIAKID') && __SZULODIAKID>0) { + $diakId=__SZULODIAKID; + } + if ($diakId>0) { + $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; + $values = array($hazifeladatId, $diakId); + db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + } + } + } + + ?> \ No newline at end of file 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 23d9f391..931b7dcd 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 @@ -105,9 +105,11 @@ } if ($diakId>0) { - $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; - $values = array($ADAT['hazifeladatId'], $diakId); - db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + // $q = "INSERT IGNORE INTO oraHazifeladatDiak (hazifeladatId,diakId,diakLattamDt) VALUES (%u,%u,NOW())"; + // $values = array($ADAT['hazifeladatId'], $diakId); + // db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); + + oraHazifeladatDiakLatta($ADAT['hazifeladatId']); if ($action=='hazifeladatKesz') { if ($diakId>0 && $ADAT['hazifeladatId']>0) { 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 31dd4699..1596e591 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 @@ -30,6 +30,10 @@ $_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId); + if ($ORAADAT['hazifeladatId']>0) { + oraHazifeladatDiakLatta($ORAADAT['hazifeladatId']); // log: diakLattamDt + } + if ($dolgozatBeirhato === true && $action=='dolgozatBeiras') { $dolgozatId = ujDolgozat('',$ORAADAT['tankorId']); dolgozatModositas($dolgozatId,'',$ORAADAT['dt']); diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4642 +4643 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index f60ce0ab..19543162 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4642 -a41d6a896afcbc699ca113dd206a5c22 mayor-fenntarto-rev4642.tgz -4279b8ac06cb7ae7f3ce91872f107b7f mayor-installer-sulix-rev4642.tgz -35556f0254ac535edd802d3bd409ad3f mayor-wiki-rev4642.tgz -0c04c43a6b16746ea18ffd2e58844e0a mayor-installer-rev4642.tgz -457035dc58d489da34bcdda1eef7c1cf mayor-portal-rev4642.tgz -c951c85fd4ca3738a160a6a2dcdd103a mayor-felveteli-rev4642.tgz -6e02e9bf29af5b20eef089f9dd323d0d mayor-jatek-rev4642.tgz -1046f7eddfd9a2cdd78a4371587cf1f9 mayor-locales-jp_JP-rev4642.tgz -9b914f32434afb5453462670ff91d28e mayor-locales-de_DE-rev4642.tgz -735b7bf5c322d7496f09160e23a15570 mayor-locales-en_US-rev4642.tgz -df2ec8d8fae2b2e8feac83fcfa175969 mayor-naplo-rev4642.tgz -82caa6467fec4455ab4ba3fc179f4603 mayor-base-rev4642.tgz +Revision 4643 +bc36d1c5e47744e544439c0030a091be mayor-fenntarto-rev4643.tgz +1d4e1f10ce7975b5239891389a099655 mayor-installer-sulix-rev4643.tgz +4ba1eea4e3571eac402b74229621f47d mayor-wiki-rev4643.tgz +8f0c90bb4b8f32c8155fbdc0930089fb mayor-installer-rev4643.tgz +b86eed6f38dfe5c5a6c43ecb41d6fade mayor-portal-rev4643.tgz +edf95931bebc03d1021c5d9af179bef3 mayor-felveteli-rev4643.tgz +c96ddf6ac402201374ca7ffb3a1b5b67 mayor-jatek-rev4643.tgz +23e9bdccc90a05baf51794a5dfd73fa5 mayor-locales-jp_JP-rev4643.tgz +0aee8ce539a4a01f6933c4826743be65 mayor-locales-de_DE-rev4643.tgz +658c650356020fb3e1947d18db0836bb mayor-locales-en_US-rev4643.tgz +659e20ffd263aa865b2b202967c7aa70 mayor-naplo-rev4643.tgz +9916a08bb6a312dec821621f9e9d104f mayor-base-rev4643.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index e387cc7f..4fbccb1a 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4642 +4643 diff --git a/rev.txt b/rev.txt index e387cc7f..4fbccb1a 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4642 +4643 -- cgit v1.2.3 From 4c6b313fae97ccb7eaae75b5d05881f10469e13d Mon Sep 17 00:00:00 2001 From: M.Gergo Date: Tue, 31 Mar 2020 19:30:03 +0200 Subject: Rev: 4644 --- 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 +- .../install/module-naplo/mysql/tanev.sql | 2 ++ mayor-orig/mayor-naplo/log/mayor-naplo.rev | 2 +- .../mayor-naplo/update/pre004643-1-naplo.sql | 27 +++++++++++++++ .../www/include/modules/naplo/share/ora.php | 40 ++++++++++++++++++++++ .../private/naplo/haladasi/hazifeladat-pre.php | 28 ++++++++++----- .../policy/private/naplo/orarend/orarend-pre.php | 7 ++++ .../policy/private/naplo/tools/getOraAdat-pre.php | 3 -- .../module-naplo/css/haladasi/hazifeladat.css | 5 +++ .../classic/module-naplo/css/orarend/orarend.css | 14 +++++++- .../module-naplo/html/haladasi/hazifeladat.phtml | 10 +++++- .../module-naplo/html/orarend/orarend.phtml | 33 ++++++++++++++---- .../classic/module-naplo/html/uzeno/uzeno.phtml | 3 +- .../javascript/haladasi/hazifeladat.jquery.min.js | 7 ++++ .../module-naplo/javascript/naplo.jquery.min.js | 16 +++++++-- mayor-orig/mayor-portal/log/mayor-portal.rev | 2 +- mayor-orig/mayor-wiki/log/mayor-wiki.rev | 2 +- mayor-orig/md5sum | 26 +++++++------- mayor-orig/rev.txt | 2 +- rev.txt | 2 +- 28 files changed, 199 insertions(+), 50 deletions(-) create mode 100644 mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql (limited to 'mayor-orig/mayor-base') diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4643 +4644 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 4fbccb1a..ff844583 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 @@ -4643 +4644 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4643 +4644 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 4fbccb1a..ff844583 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 @@ -4643 +4644 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 4fbccb1a..ff844583 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 @@ -4643 +4644 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 4fbccb1a..ff844583 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 @@ -4643 +4644 diff --git a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql index efe43f5d..f8d78259 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql @@ -148,8 +148,10 @@ CREATE TABLE `oraHazifeladat` ( `oraId` int(10) unsigned DEFAULT NULL, `hazifeladatLeiras` text COLLATE utf8_hungarian_ci NOT NULL, `hazifeladatFeltoltesEngedely` tinyint(3) unsigned DEFAULT '0', + `hazifeladatHataridoDt` datetime DEFAULT NULL, PRIMARY KEY (`hazifeladatId`), UNIQUE KEY `oraId` (`oraId`), + KEY `hazifeladatHataridoDt` (`hazifeladatHataridoDt`), CONSTRAINT `oraHazifeladat_ibfk_1` FOREIGN KEY (`oraId`) REFERENCES `ora` (`oraId`) ON DELETE CASCADE ON UPDATE CASCADE ) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_hungarian_ci; diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql new file mode 100644 index 00000000..4b662642 --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004643-1-naplo.sql @@ -0,0 +1,27 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4643 $$ + +CREATE PROCEDURE upgrade_database_4643() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF NOT EXISTS ( + SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladat' and COLUMN_NAME='hazifeladatHataridoDt' +) THEN + +ALTER TABLE `oraHazifeladat` ADD `hazifeladatHataridoDt` datetime DEFAULT NULL; + +END IF; + + +IF NOT EXISTS ( + SELECT * FROM information_schema.statistics WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladat' and INDEX_NAME = 'hazifeladatHataridoDt' +) THEN + +ALTER TABLE `oraHazifeladat` ADD INDEX `hazifeladatHataridoDt` (`hazifeladatHataridoDt`); + +END IF; + +END $$ +DELIMITER ; +CALL upgrade_database_4643(); diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php index 60ddb4fa..1809ab50 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php @@ -26,6 +26,8 @@ munkaido, hazifeladatId, hazifeladatLeiras, + hazifeladatFeltoltesEngedely, + hazifeladatHataridoDt, cimkeId, cimkeLeiras FROM `%s`.ora LEFT JOIN `%s`.oraHazifeladat USING (oraId) @@ -633,6 +635,18 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count( return $R; } + function getKovetkezoOraAdatByOraId($oraId) { + if ($oraId>0) { + $q = "SELECT * FROM ora WHERE oraId = %u"; + $v = array($oraId); + $ORA = db_query($q,array('debug'=>false,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'record')); + $q = "SELECT * FROM ora WHERE dt>'%s' AND tankorId=%u AND tipus NOT IN ('elmarad','elmarad_máskor') ORDER BY dt LIMIT 1"; + $v = array($ORA['dt'],$ORA['tankorId']); + $R = db_query($q,array('debug'=>false,'fv'=>'oraMostVane','modul'=>'naplo','values'=>$v,'result'=>'record')); + } + return $R; + } + function getDiakOra($diakId,$dt,$ora,$olr_intezmeny = '',$olr_naplo) { // jelenlét mezőt nem vesszük figyelembe!!! // diakId->tankor->ora @@ -669,5 +683,31 @@ WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count( return $R; } + function getDiakHazifeladatByHatarido($diakId,$ADAT,$olr='') { + $dt = $hazifeladatHataridoDt = readVariable($ADAT['hazifeladatHataridoDt'],'date',null); + $R = array(); + if ($diakId>0 && !is_null($hazifeladatHataridoDt)) { + $tankorIds = getTankorByDiakId($diakId, __TANEV, $SET = array('csakId' => true, 'tolDt' => $dt, 'igDt' => $dt, 'result'=>'idonly'),$olr); + if (count($tankorIds)>0) { + $q = "SELECT *,getNev(tankorId,'tankor') AS tankorNev +FROM oraHazifeladat +LEFT JOIN ora USING (oraId) +LEFT JOIN oraHazifeladatDiak ON (oraHazifeladat.hazifeladatId = oraHazifeladatDiak.hazifeladatId AND diakId=%u) +WHERE tankorId IN (".implode(',',$tankorIds).") AND hazifeladatHataridoDt BETWEEN '%s' AND '%s 23:59:59'"; + $v = array($diakId,$hazifeladatHataridoDt,$hazifeladatHataridoDt); + } else { // fallback + $q = "SELECT *,getNev(tankorId,'tankor') AS tankorNev FROM oraHazifeladat LEFT JOIN oraHazifeladatDiak USING (hazifeladatId) LEFT JOIN ora USING (oraId) WHERE diakId=%u AND DATE(hazifeladatHataridoDt)='%s'"; + $v = array($diakId,$hazifeladatHataridoDt); + } + $R = db_query($q,array('debug'=>false,'fv'=>'getDiakhazifeladatByOraIds','modul'=>'naplo','values'=>$v,'result'=>'indexed'),$olr); + } + return $R; + } + + function getOsztalyHazifeladatByHatarido($osztalyId,$ADAT,$olr='') { + // loop $diakId + $hazifeladatHataridoDt = $ADAT['hazifeladatHataridoDt']; + + } ?> 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 931b7dcd..ac911f8b 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 @@ -53,21 +53,32 @@ $values = array($ADAT['oraId']); $ADAT['hazifeladatId'] = $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'value','values'=>$values)); $ADAT['oraAdat'] = getOraadatById($oraId); + $ADAT['oraAdat']['oraBeirhato'] = oraBeirhato($ADAT['oraAdat']['oraId']); $ADAT['nevsor'] = getTankorDiakjaiByInterval($ADAT['oraAdat']['tankorId'], __TANEV, $ADAT['oraAdat']['dt'], $ADAT['oraAdat']['dt']); - + $ADAT['kovetkezoOraAdat'] = getKovetkezoOraAdatByOraId($ADAT['oraAdat']['oraId']); if (__TANAR===true && $action=='hazifeladatBeiras') { + $hazifeladatHataridoDt = readVariable($_POST['hazifeladatHataridoDt'],'datetime',null); $hazifeladatFeltoltesEngedely = readVariable($_POST['hazifeladatFeltoltesEngedely'],'id',0); if ($hazifeladatId>0) { // update - $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u"; - $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']); - $r = db_query($q, array('modul'=>'naplo','result'=>'update','values'=>$values)); + if (is_null($hazifeladatHataridoDt)) { + $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u"; + $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']); + } else { + $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt='%s' WHERE hazifeladatId=%u"; + $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$hazifeladatHataridoDt,$ADAT['hazifeladatId']); + } + $r = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'update','values'=>$values)); } elseif ($oraId>0) { // insert - $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely) VALUES ('%s',%u,%u)"; - $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely); + if (is_null($hazifeladatHataridoDt)) { + $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely) VALUES ('%s',%u,%u)"; + $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely); + } else { + $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId,hazifeladatFeltoltesEngedely,hazifeladatHataridoDt) VALUES ('%s',%u,%u,'%s')"; + $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId'],$hazifeladatFeltoltesEngedely,$hazifeladatHataridoDt); + } $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); - } - if ($oraId>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) { + if ($oraId>0 && $ADAT['oraAdat']['oraBeirhato']===true ) { $leiras = readVariable($_POST['oraLeiras'],'string'); updateHaladasiNaploOra($oraId, $leiras); } @@ -170,6 +181,7 @@ $ADAT['hazifeladatDiak'] = db_query($q, array('debug'=>false,'modul'=>'naplo','result'=>'indexed','values'=>$values)); } $ADAT['oraAdat'] = getOraadatById($oraId); + $ADAT['oraAdat']['oraBeirhato'] = oraBeirhato($ADAT['oraAdat']['oraId']); $TOOL['vissza'] = array('tipus'=>'vissza', 'paramName'=>'vissza', diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php index c56b6d87..262ff572 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/orarend/orarend-pre.php @@ -235,7 +235,14 @@ $_napok = getNapok(array('tolDt'=>$tolDt,'igDt'=>$igDt)); for ($i=0; $i0) { + $lr = db_connect('naplo'); + $_HF = getDiakHazifeladatByHatarido($diakId,array('hazifeladatHataridoDt'=>$_dt),$lr); + if (is_array($_HF) && count($_HF)>0) $ADAT['hazifeladat'][$_dt] = $_HF; + db_close($lr); + } } if (_POLICY!='public' && is_array($TANKOROK)) { 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 1596e591..064bc796 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 @@ -27,13 +27,10 @@ $leiras = readVariable($_POST['leiras'], 'string'); updateHaladasiNaploOra($oraId,$leiras); } - $_JSON['oraAdat'] = $ORAADAT = getOraAdatById($oraId); - if ($ORAADAT['hazifeladatId']>0) { oraHazifeladatDiakLatta($ORAADAT['hazifeladatId']); // log: diakLattamDt } - if ($dolgozatBeirhato === true && $action=='dolgozatBeiras') { $dolgozatId = ujDolgozat('',$ORAADAT['tankorId']); dolgozatModositas($dolgozatId,'',$ORAADAT['dt']); 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 cc5f8869..a44e9d2d 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 @@ -65,3 +65,8 @@ table.hazifeladatDiak tr td a:hover, fieldset.adatok a:hover { text-decoration:underline; color: cornflowerblue; } table.hazifeladatDiak tr td.kesz { background-color: lightgreen; color:white; text-align:center } + + 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; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css index 836e0ee2..9fc17d27 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css @@ -90,12 +90,25 @@ table.orarend tbody tr td div.jegyzet { margin:2px; font-size: x-small; } +table.orarend tbody tr td div.hazifeladat { + background-color: #3f51b5; color:white; + background-color: #e91e63; + border-radius:2px; padding:2px; + border: solid 1px white; + margin:2px; + font-size: x-small; +} table.orarend tbody tr td div.jegyzet.publikus0 { } table.orarend tbody tr td div.jegyzet.publikus1 { border: dashed 1px white; } table.orarend tbody tr td div.jegyzet.publikus2 { border: dotted 1px white; } table.orarend tbody tr td div.jegyzet.mase.publikus1 { background-color: #4caf50;} table.orarend tbody tr td div.jegyzet.mase.publikus2 { background-color: #4caf50;} + +table.orarend tbody tr td div.hazifeladat span { padding-right:2px; } +table.orarend tbody tr td div.hazifeladat.tanarLattam { background-color: #2E7D32;} +table.orarend tbody tr td div.hazifeladat.diakKesz { background-color: #4CAF50;} + table.orarend tbody tr.orarendJegyzetSor th { background-color: orange; border-color: orange; font-weight:normal; font-size: x-small; cursor: pointer} table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer { background-color: cornflowerblue; } table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer div:hover { border-color: #bbb; transition : border 50ms ease-out;} @@ -215,7 +228,6 @@ div.unfinished { table.orarend span.cimke_4 { background-color: #673ab7; } - h2.mayorSocialEdition { text-align: center; background-color: #f06; 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 e03ac99a..83d5d6f1 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 @@ -107,7 +107,7 @@ echo ''; echo '
'.ucfirst(_TANANYAG).''."\n"; - if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) { + if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) { echo ''; echo ''; } else { @@ -116,6 +116,7 @@ echo '
'."\n"; echo '
'._HAZIFELADAT.''."\n"; + echo ''; @@ -151,6 +152,13 @@ echo ''; echo ''; echo ''; + echo 'Leadási határidő: '; + if ($ADAT['kovetkezoOraAdat']['oraId']>0) { + echo ''; + echo ''; + echo 'következő tervezett óra: '.$ADAT['kovetkezoOraAdat']['dt']; + echo ''; + } echo '
'; echo ''; echo '
'; 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 77ad0bce..f36850bc 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 @@ -24,11 +24,7 @@ function putOrarend($ADAT) { global $aHetNapjai,$skin; - // $ADAT['utolsoorak'][$teremId]['oraId'] - - /* Képzés-Mátrix */ - //dump($ADAT['kepzesOraterv']); if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) { $kepzes_figyel = true; $KEPZES_MATRIX[2]=$ADAT['kepzesOraterv']['első nyelv']['sum']; @@ -37,7 +33,6 @@ +$ADAT['kepzesOraterv']['kötelezően választható']['sum'] +$ADAT['kepzesOraterv']['szabadon választható']['sum'] ; - //dump($KEPZES_MATRIX); } else $kepzes_figyel = false; // ---------------- $multiTelephely = (count($ADAT['orarend']['telephelyIdk'])>1); @@ -152,10 +147,10 @@ } echo ''."\n"; // echo ''.$het.'. heti órarend'; - if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; } + if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0 || (is_array($ADAT['hazifeladat']) && count($ADAT['hazifeladat'])>0)) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; } echo ''; echo ''; - echo 'dolgozatok, jegyzetek'; + echo 'dolgozatok, jegyzetek, határidők'; // echo ''; echo ''; for ($nap=1;$nap<=$ADAT['hetiMaxNap'];$nap++) { @@ -192,6 +187,30 @@ echo ''; } } + + //for ($d=0; $d0) { + for ($_h=0; $_hházifeladat '.$_str.'
'.$_HF['tankorNev'].''; + } + } + //} echo ''; } echo ''; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml index 24304570..a7302388 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml @@ -124,7 +124,8 @@ $href_szal = href('index.php?page=naplo&sub=uzeno&f=uzeno&szalId='.$D['feladoId'].'_'.$D['feladoTipus'].'_'.$D['cimzettId'].'_'.$D['cimzettTipus'].'&mId='.$D['mId'],array('sessionID','lang','policy')); // $D['txt'] = ''.nl2br(htmlspecialchars($D['txt'])).''; - $D['txt'] = makelinksclickable(nl2br(supertext($D['txt']))); + // $D['txt'] = makelinksclickable(nl2br(supertext($D['txt']))); + $D['txt'] = (nl2br(supertext($D['txt']))); echo (mb_substr($D['txt'],0,2000,'UTF-8')); if (mb_strlen($D['txt'],'UTF-8')>2000) { echo ' ...'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js index 4d225a86..a8e1d250 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js @@ -9,4 +9,11 @@ $(function() { } }); + $('#hintDt').click(function(){ + // console.log($('#hazifeladatHataridoDt').val()); + $('#hazifeladatHataridoDt').addClass('modosit'); + $('#hazifeladatHataridoDt').val($('#hintDt').data('hintdt')); + }); + + }); \ No newline at end of file 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 df72b0cb..b5d19f89 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 @@ -727,18 +727,30 @@ processJSONOraAdat = function(adat) { } } + // content += '

Óra kapcsolatai

'; // content += ''; content += '

Házi feladat '; - content += ''; + content += ''; + if (adat['oraAdat']['hazifeladatFeltoltesEngedely']==1) { + content += ''; + } else { + content += ''; + } + content += ''; content += '

'; if (adat['oraAdat']['hazifeladatId']>0) { - content += '
'; + if (adat['oraAdat']['hazifeladatHataridoDt']!=null) { + content += '
  • Határidő: '+adat['oraAdat']['hazifeladatHataridoDt']+'
'; + } + if (adat['oraAdat']['hazifeladatLeiras']!='') { + content += '
'; content += adat['oraAdat']['hazifeladatLeiras']; content += '
'; + } } content += '

Dolgozatok

'; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 4fbccb1a..ff844583 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4643 +4644 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 19543162..b3aec885 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4643 -bc36d1c5e47744e544439c0030a091be mayor-fenntarto-rev4643.tgz -1d4e1f10ce7975b5239891389a099655 mayor-installer-sulix-rev4643.tgz -4ba1eea4e3571eac402b74229621f47d mayor-wiki-rev4643.tgz -8f0c90bb4b8f32c8155fbdc0930089fb mayor-installer-rev4643.tgz -b86eed6f38dfe5c5a6c43ecb41d6fade mayor-portal-rev4643.tgz -edf95931bebc03d1021c5d9af179bef3 mayor-felveteli-rev4643.tgz -c96ddf6ac402201374ca7ffb3a1b5b67 mayor-jatek-rev4643.tgz -23e9bdccc90a05baf51794a5dfd73fa5 mayor-locales-jp_JP-rev4643.tgz -0aee8ce539a4a01f6933c4826743be65 mayor-locales-de_DE-rev4643.tgz -658c650356020fb3e1947d18db0836bb mayor-locales-en_US-rev4643.tgz -659e20ffd263aa865b2b202967c7aa70 mayor-naplo-rev4643.tgz -9916a08bb6a312dec821621f9e9d104f mayor-base-rev4643.tgz +Revision 4644 +ab263d8b93d75df53b598ccc24c4d975 mayor-fenntarto-rev4644.tgz +49cb8a50daad5818311541b7852dcc0c mayor-installer-sulix-rev4644.tgz +ed32d2aa7c4c13278df05fd1beda9985 mayor-wiki-rev4644.tgz +88660591b1c72b90f0e0ebd851f7a61e mayor-installer-rev4644.tgz +a717d073783b600af8a02033450a2cf9 mayor-portal-rev4644.tgz +9e2ca0586190b28f4291b932a0904917 mayor-felveteli-rev4644.tgz +5bdd1fb3f12661bff6a4c545ad32dabc mayor-jatek-rev4644.tgz +602762e9f6894a1520eaccadbffc2dca mayor-locales-jp_JP-rev4644.tgz +95f02e80fa79baf96d25c282b8e060ad mayor-locales-de_DE-rev4644.tgz +d7fd6f4d8e0b3ce2500d2bc5b1d7cfc8 mayor-locales-en_US-rev4644.tgz +10d420ecd874566129caca3420b486b1 mayor-naplo-rev4644.tgz +3b029f0dd842be81764f6273b8ec3957 mayor-base-rev4644.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 4fbccb1a..ff844583 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4643 +4644 diff --git a/rev.txt b/rev.txt index 4fbccb1a..ff844583 100644 --- a/rev.txt +++ b/rev.txt @@ -1 +1 @@ -4643 +4644 -- cgit v1.2.3