diff options
| author | M.Gergo | 2020-04-01 15:50:03 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-04-01 15:50:03 +0200 |
| commit | ad6a38cc882f9da97aae74bb8c48ad9f70bc39e8 (patch) | |
| tree | 8fb5320968ab686e737f927658373bef18d0e5d5 /mayor-orig/mayor-naplo | |
| parent | 973ae816e66352e9d97facf92f8ffc3bcc0d89bd (diff) | |
| download | mayor-rev4646.tar.gz mayor-rev4646.zip | |
Rev: 4646rev4646
Diffstat (limited to 'mayor-orig/mayor-naplo')
3 files changed, 9 insertions, 4 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index df260d9e..432cde09 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4645 +4646 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 3fd87f21..86ca57a0 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 @@ -61,7 +61,7 @@ $hazifeladatFeltoltesEngedely = readVariable($_POST['hazifeladatFeltoltesEngedely'],'id',0); if ($hazifeladatId>0) { // update if (is_null($hazifeladatHataridoDt)) { - $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u WHERE hazifeladatId=%u"; + $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt=NULL WHERE hazifeladatId=%u"; $values = array($ADAT['hazifeladatLeiras'],$hazifeladatFeltoltesEngedely,$ADAT['hazifeladatId']); } else { $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s',hazifeladatFeltoltesEngedely=%u,hazifeladatHataridoDt='%s' WHERE hazifeladatId=%u"; 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 e6e2d4e6..98337d4e 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 @@ -79,7 +79,10 @@ echo '<style type="text/css"> if ($ADAT['hazifeladatDiak']['tanarLattamDt']!='') { echo ' <span class="icon-ok-sign" style="color: lightgreen"></span> '.$ADAT['hazifeladatDiak']['tanarLattamDt']; } - if (strtotime($ADAT['hazifeladatDiak']['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { + + if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' + && $D['hazifeladatDiakFileDt']!='' + && strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; } echo '</li></ul>'; @@ -222,7 +225,9 @@ echo '<style type="text/css"> echo '<td colspan="1" class="'.ekezettelen($D['hazifeladatDiakStatus']).'">'.$D['hazifeladatDiakStatus'].'</td>'; //echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>'; echo '<td>'; - if (strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { + if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='' + && $D['hazifeladatDiakFileDt']!='' + && strtotime($D['hazifeladatDiakFileDt']) > strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])) { echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; } echo '</td>'; |