aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorM.Gergo2020-03-18 18:41:53 +0100
committerM.Gergo2020-03-18 18:41:53 +0100
commit936098df78b3426c0a0d642921edd33e81b7a4c7 (patch)
tree3569f266edc71a6fe58ee7a65e1e420fb59fccaf
parent4e81ff6076ac2d39b3a90bcdd68a04fe874e31da (diff)
downloadmayor-936098df78b3426c0a0d642921edd33e81b7a4c7.tar.gz
mayor-936098df78b3426c0a0d642921edd33e81b7a4c7.zip
Rev: 4624rev4624
-rw-r--r--mayor-orig/mayor-base/log/mayor-base.rev2
-rw-r--r--mayor-orig/mayor-felveteli/log/mayor-felveteli.rev2
-rw-r--r--mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev2
-rw-r--r--mayor-orig/mayor-installer-orig/log/mayor-installer.rev2
-rw-r--r--mayor-orig/mayor-installer-sulix/log/mayor-installer-sulix.rev2
-rw-r--r--mayor-orig/mayor-jatek/log/mayor-jatek.rev2
-rw-r--r--mayor-orig/mayor-locales-de_DE/log/mayor-locales-de_DE.rev2
-rw-r--r--mayor-orig/mayor-locales-en_US/log/mayor-locales-en_US.rev2
-rw-r--r--mayor-orig/mayor-locales-jp_JP/log/mayor-locales-jp_JP.rev2
-rw-r--r--mayor-orig/mayor-naplo/log/mayor-naplo.rev2
-rw-r--r--mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php10
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css11
-rw-r--r--mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml28
-rw-r--r--mayor-orig/mayor-portal/log/mayor-portal.rev2
-rw-r--r--mayor-orig/mayor-wiki/log/mayor-wiki.rev2
-rw-r--r--mayor-orig/md5sum26
-rw-r--r--mayor-orig/rev.txt2
-rw-r--r--rev.txt2
18 files changed, 57 insertions, 46 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-base/log/mayor-base.rev
+++ b/mayor-orig/mayor-base/log/mayor-base.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
+++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
+++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
+++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev
@@ -1 +1 @@
-4623
+4624
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 899315a9..c000845d 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 @@
-4623
+4624
diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev
+++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev
@@ -1 +1 @@
-4623
+4624
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 899315a9..c000845d 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 @@
-4623
+4624
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 899315a9..c000845d 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 @@
-4623
+4624
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 899315a9..c000845d 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 @@
-4623
+4624
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev
+++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
index 3dbf4c9d..9b397670 100644
--- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
+++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/haladasi-pre.php
@@ -102,7 +102,7 @@ if ( $skin == 'ajax'
// egy tanár ($tanarId) vagy osztály ($osztaly) összes órája --> lapozni kell
// reading sensitive data
- $igDt = readVariable($_POST['igDt'], 'datetime', date('Y-m-d'));
+ $igDt = readVariable($_POST['igDt'], 'datetime', date('Y-m-d', strtotime('next saturday')));
$tolDt = readVariable($_POST['tolDt'], 'datetime');
$lapoz = readVariable($_POST['lapoz'], 'enum', null, array('<<','>>','nextWeek','prevWeek'));
$lapoz1 = readVariable($_POST['lapoz1'], 'enum', null, array('<<','>>','nextWeek','prevWeek'));
@@ -133,7 +133,7 @@ if ( $skin == 'ajax'
if ($csakUres || strtotime($tolDt) < strtotime($_TANEV['kezdesDt'])) $tolDt = date('Y-m-d',strtotime($_TANEV['kezdesDt']));
// Ha ezt kiveszem, akkor mindig kirakja a teljes hetet, de a jövőbeli órákat nem lehet beírni!
// Itt a post értékét nem használjuk fel, csak vizsgáljuk.
- if ((!isset($_POST['igDt']) || $_POST['igDt'] == '')&& strtotime($igDt) > time()) $igDt = date('Y-m-d');
+// if ((!isset($_POST['igDt']) || $_POST['igDt'] == '')&& strtotime($igDt) > time()) $igDt = date('Y-m-d');
define('_SHOW_DAYS_FROM',$tolDt);
define('_SHOW_DAYS_TO',$igDt);
@@ -144,7 +144,6 @@ if ( $skin == 'ajax'
define('_SHOW_DAYS_TO',date('Y-m-d'));
}
-
/* ------------------------------------------------- */
// Jogosultság ellenőrzés, tanév aktív-e...
@@ -176,14 +175,13 @@ if ( $skin == 'ajax'
)
) {
// checkNaplo (2020)
- /*
- checkNaplo($igDt);
+ if (strtotime('next saturday')>=strtotime($igDt)) {
$_dt = $igDt;
while (strtotime($_dt)>time()) {
$_dt = date('Y-m-d',strtotime('-1 day',strtotime($_dt)));
checkNaplo($_dt);
}
- */
+ }
// action
if ($action == 'haladasiNaploBeiras' && (
is_array($_POST['oraId'])
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 063488d4..4477f75c 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
@@ -31,12 +31,11 @@
table.haladasiBejegyzesek tbody tr.torolt input.ajaxRequestDone { display:none; }
table.haladasiBejegyzesek tbody tr.torolt span.INFO.ajaxRequestDone { display:none; }
- table.haladasiBejegyzesek tbody.parosNap {
- background-color: #dddddd;
- }
- table.haladasiBejegyzesek tbody.paratlanNap {
- background-color: #eeeeee;
- }
+ table.haladasiBejegyzesek tbody.parosNap { background-color: #dddddd; }
+ table.haladasiBejegyzesek tbody.paratlanNap { background-color: #eeeeee; }
+ table.haladasiBejegyzesek tbody.ma { background-color: #c5cae9; }
+ table.haladasiBejegyzesek tbody.jovo { background-color: #aaa; color:white; }
+
table.haladasiBejegyzesek tbody td.ora {
text-align: center;
}
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 e6377aeb..3c36e9f2 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
@@ -166,6 +166,9 @@
$time = strtotime($dt);
$count = count($dNap);
+ $jovoDt = (strtotime($dt)>strtotime(date('Y-m-d')));
+ $maDt = (strtotime($dt)==strtotime(date('Y-m-d')));
+
$tipus = $orarendiHet = $megjegyzes = array();
if (is_array($napInfos)) foreach ($napInfos as $ni) {
if (!in_array($ni['tipus'], $tipus)) $tipus[] = $ni['tipus'];
@@ -174,19 +177,24 @@
}
$tanitasiNap = false;
if (in_array('tanítási nap', $tipus) || in_array('speciális tanítási nap', $tipus)) {
- if (date('w',$time) % 2 == 0) echo '<tbody class="parosNap">'."\n";
- else echo '<tbody class="paratlanNap">'."\n";
+ if (date('w',$time) % 2 == 0) $_class[]="parosNap";
+ else $_class[]="paratlanNap";
$tanitasiNap = true;
} elseif (in_array('tanítás nélküli munkanap', $tipus)) {
- echo '<tbody class="tanitasNelkul">'."\n";
+ $_class[]="tanitasNelkul";
} elseif (in_array('szorgalmi időszakon kívüli munkanap', $tipus)) {
- echo '<tbody class="szorgalmiIdoszakonKivul">'."\n";
+ $_class[]="szorgalmiIdoszakonKivul";
} else {
- echo '<tbody class="szunet">'."\n";
+ $_class[]="szunet";
}
+
+ if ($jovoDt) $_class[]="jovo";
+ if ($maDt) $_class[]="ma";
+
+ echo '<tbody class="'.implode(' ',$_class).'">'."\n";
echo '<tr>';
echo '<th class="nap">';
- if (__PLUSZBEIRHAT===true) echo '<div class="icon-plus-sign rejtMutat"></div>';
+ if (__PLUSZBEIRHAT===true && !$jovoDt) echo '<div class="icon-plus-sign rejtMutat"></div>';
echo '</th>'."\n";
// Az első cella a dátum/nap
echo '<th colspan="8" class="nap">';
@@ -358,6 +366,10 @@
if ( $ADAT['tankorTipusok'][$dOra['tankorTipusId']]['jelleg']=='osztályfüggetlen' && ($ADAT['haladasiTipus']=='osztalyHaladasi' || $ADAT['haladasiTipus']=='diakHaladasi')) return false;
$modosithatoOra = modosithatoOra($dOra);
// $torolhetoOra = torolhetoOra($dOra);
+
+ $jovoDt = (strtotime($dOra['dt'])>strtotime(date('Y-m-d')));
+ $maDt = (strtotime($$dOra['dt'])==strtotime(date('Y-m-d')));
+
if (!in_array($dOra['tipus'],array('normál','normál máskor'))) {
if ($dOra['tipus'] == 'összevonás') $tipus = 'Ö';
else $tipus = nagybetus(substr($dOra['tipus'],0,1));
@@ -544,6 +556,8 @@
} else {
if ($dOra['leiras']!='') {
echo '<td>'.$dOra['leiras'];
+ } elseif ($jovoDt) {
+ echo '<td class="nincsBeirva"> ';
} else {
echo '<td class="nincsBeirva">'._NINCS_BEIRVA;
}
@@ -568,7 +582,7 @@
}
//2014? echo '<a href="'.$href.'" tabindex="200" class="onClickUpdateWindow">';
echo '<a href="'.$href.'" tabindex="200" class="h" >';
- echo _HIANYZOK;
+ if (!$jovoDt) echo _HIANYZOK;
echo '</a>';
}
echo '</td>'."\n";
diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-portal/log/mayor-portal.rev
+++ b/mayor-orig/mayor-portal/log/mayor-portal.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
index 899315a9..c000845d 100644
--- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev
+++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev
@@ -1 +1 @@
-4623
+4624
diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum
index 82496192..87ad9446 100644
--- a/mayor-orig/md5sum
+++ b/mayor-orig/md5sum
@@ -1,13 +1,13 @@
-Revision 4623
-80526c691f0a66d00925d09ab81fd565 mayor-fenntarto-rev4623.tgz
-0414411d3e6adfe39dbdb5edbbf777bb mayor-installer-sulix-rev4623.tgz
-2e0208ce2d0143f0e7cd06876d5c942c mayor-wiki-rev4623.tgz
-207f42e9f9abc88764b0c1bdb510a61d mayor-installer-rev4623.tgz
-c03100f9917257e1a8b6c2510c4dfe55 mayor-portal-rev4623.tgz
-df2ccdbfdf57003997bdd69d14c1747d mayor-felveteli-rev4623.tgz
-ad816c6e7a9300f70a8a6576751df613 mayor-jatek-rev4623.tgz
-da48caac3176da8a848021479cc11680 mayor-locales-jp_JP-rev4623.tgz
-59cf731ff3650415b3ae45d1973e833e mayor-locales-de_DE-rev4623.tgz
-66e8c16c5fadb2bef0c9dff4ab7f9fca mayor-locales-en_US-rev4623.tgz
-535d4fb820f0fca4bb946b8c223c194c mayor-naplo-rev4623.tgz
-67d71bcea41ff3d8630e1364c9ff63c9 mayor-base-rev4623.tgz
+Revision 4624
+d24ec421e28cf71890f80dcfa9c09623 mayor-fenntarto-rev4624.tgz
+407a72ea79e4717e3e727c32070b36c8 mayor-installer-sulix-rev4624.tgz
+b4897eef1d34191da022acb19f065822 mayor-wiki-rev4624.tgz
+ffe22e6c4c7645c288f87c9b3e1724ab mayor-installer-rev4624.tgz
+8fbcb1001115284adeef17654cb14187 mayor-portal-rev4624.tgz
+bdc1bfdfca9684cb037ab57e3423d07c mayor-felveteli-rev4624.tgz
+cf9afe59c57a7840d3e1e7daf55e9212 mayor-jatek-rev4624.tgz
+c4b14c36aa3576fff34fdee4920454e1 mayor-locales-jp_JP-rev4624.tgz
+fd1db3c37554a3c492929c801e49dcaf mayor-locales-de_DE-rev4624.tgz
+16adfa3611854ad7d6d3eb9978ab9d4a mayor-locales-en_US-rev4624.tgz
+9d5a6b5795cce6cb795b4b9130a7be4e mayor-naplo-rev4624.tgz
+951ce35dfb63f8d4d8f210b1d9346297 mayor-base-rev4624.tgz
diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt
index 899315a9..c000845d 100644
--- a/mayor-orig/rev.txt
+++ b/mayor-orig/rev.txt
@@ -1 +1 @@
-4623
+4624
diff --git a/rev.txt b/rev.txt
index 899315a9..c000845d 100644
--- a/rev.txt
+++ b/rev.txt
@@ -1 +1 @@
-4623
+4624