diff options
| author | M.Gergo | 2019-09-06 13:29:32 +0200 |
|---|---|---|
| committer | M.Gergo | 2019-09-06 13:29:32 +0200 |
| commit | 6d684ff9fb3caf8de057829bda27995d5d9de361 (patch) | |
| tree | 5923ad3a57a1bc099bd8bb76fe840d6dce096e75 /mayor-orig/mayor-naplo | |
| parent | 8505f5bb03f6bb931a2d97592ad4c3d4ef475b71 (diff) | |
| download | mayor-rev4538.tar.gz mayor-rev4538.zip | |
Rev: 4538rev4538
Diffstat (limited to 'mayor-orig/mayor-naplo')
4 files changed, 10 insertions, 6 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 13133865..1031aed8 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4536 +4538 diff --git a/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql index 9e5370ba..d8a4ec87 100644 --- a/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql +++ b/mayor-orig/mayor-naplo/update/pre004532-1-intezmeny.sql @@ -1 +1 @@ --- CALL upgrade_database_4531(); +CALL upgrade_database_4531(); diff --git a/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql index 177d2d30..d19581ef 100644 --- a/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql +++ b/mayor-orig/mayor-naplo/update/pre004532-2-naplo.sql @@ -1 +1 @@ --- CALL upgrade_database_4531_2(); +CALL upgrade_database_4531_2(); diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php index 55914d4a..544b9b23 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/pluszora-pre.php @@ -17,7 +17,7 @@ $tankorId = readVariable($_POST['tankorId'], 'id', null); $blokkId = readVariable($_POST['tankorBlokkId'], 'id', null); $teremId = readVariable($_POST['teremId'], 'id', null); - $SzabadOrak = ''; + $SzabadOrak = array(); require_once('include/modules/naplo/share/tanar.php'); require_once('include/modules/naplo/share/osztaly.php'); @@ -76,12 +76,16 @@ // tanar Napi órái $Orak = getTanarNapiOrak($tanarId, $dt); // Szabad Órák - for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) if (!is_array($Orak[$i])) $SzabadOrak[] = $i; + for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) + if (!is_array($Orak[$i])) + array_push($SzabadOrak,$i); } elseif (isset($osztalyId)) { // osztalyNapiOrai $Orak = getOsztalyNapiOrak($osztalyId, $dt); // Szabad Órák - for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) if (!is_array($Orak[$i][0])) $SzabadOrak[] = $i; + for ($i = $napiMinOra; $i <= $napiMaxOra; $i++) + if (!is_array($Orak[$i][0])) + array_push($SzabadOrak[],$i); } if (isset($ora)) { $Termek = getSzabadTermek(array('dt' => $dt, 'ora' => $ora)); |