diff options
22 files changed, 77 insertions, 82 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4644 +4645 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 ff844583..df260d9e 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 @@ -4644 +4645 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4644 +4645 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 ff844583..df260d9e 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 @@ -4644 +4645 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 ff844583..df260d9e 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 @@ -4644 +4645 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 ff844583..df260d9e 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 @@ -4644 +4645 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 f8d78259..3ba37839 100644 --- a/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql +++ b/mayor-orig/mayor-naplo/install/module-naplo/mysql/tanev.sql @@ -164,6 +164,7 @@ CREATE TABLE `oraHazifeladatDiak` ( `hazifeladatDiakMegjegyzes` varchar(255) COLLATE utf8_hungarian_ci NOT NULL, `hazifeladatDiakFilename` varchar(255) COLLATE utf8_hungarian_ci DEFAULT NULL, `hazifeladatDiakOrigFilename` varchar(255) COLLATE utf8_hungarian_ci DEFAULT NULL, + `hazifeladatDiakFileDt` datetime DEFAULT NULL, PRIMARY KEY (`hazifeladatId`,`diakId`), UNIQUE KEY `oraHazifeladatDiak_UK` (`hazifeladatId`,`diakId`), KEY `oraHazifeladatDiak_ibfk_2` (`diakId`), diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/mayor-naplo/update/pre004644-1-naplo.sql b/mayor-orig/mayor-naplo/update/pre004644-1-naplo.sql new file mode 100644 index 00000000..047c2c7c --- /dev/null +++ b/mayor-orig/mayor-naplo/update/pre004644-1-naplo.sql @@ -0,0 +1,17 @@ +DELIMITER $$ +DROP PROCEDURE IF EXISTS upgrade_database_4644 $$ + +CREATE PROCEDURE upgrade_database_4644() +BEGIN +SET NAMES utf8 COLLATE utf8_hungarian_ci; + +IF NOT EXISTS ( + SELECT * FROM information_schema.COLUMNS WHERE TABLE_SCHEMA=DATABASE() and TABLE_NAME='oraHazifeladatDiak' and COLUMN_NAME='hazifeladatDiakFileDt' +) THEN +ALTER TABLE `oraHazifeladatDiak` ADD `hazifeladatDiakFileDt` datetime DEFAULT NULL; +UPDATE `oraHazifeladatDiak` SET `hazifeladatDiakFileDt`=`diakLattamDt` WHERE `hazifeladatDiakFilename`!=''; +END IF; + +END $$ +DELIMITER ; +CALL upgrade_database_4644(); 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 ac911f8b..3fd87f21 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 @@ -147,8 +147,6 @@ } if ($sikeresFeltoltes===true) { - // --todo unlink existing?-- - $q = "SELECT hazifeladatDiakFilename FROM oraHazifeladatDiak WHERE hazifeladatId=%u AND diakId=%u"; $values = array($ADAT['hazifeladatId'],$diakId); $oldFilename = db_query($q, array('modul'=>'naplo','result'=>'value','values'=>$values)); @@ -158,7 +156,7 @@ $origFilename = mb_ereg_replace("([^\w\s\d\-_~,;\[\]\(\).])", '', $_FILES['upfile']['name']); $origFilename = mb_ereg_replace("([\.]{2,})", '', $_FILES['upfile']['name']); if ($origFilename=='') $origFilename = $FILEADAT['filename']; - $q = "UPDATE oraHazifeladatDiak SET hazifeladatDiakFilename='%s',hazifeladatDiakOrigFilename='%s' WHERE hazifeladatId=%u AND diakId=%u"; + $q = "UPDATE oraHazifeladatDiak SET hazifeladatDiakFilename='%s',hazifeladatDiakOrigFilename='%s',hazifeladatDiakFileDt=NOW() WHERE hazifeladatId=%u AND diakId=%u"; $values = array($FILEADAT['filename'],$origFilename,$ADAT['hazifeladatId'], $diakId); db_query($q, array('modul'=>'naplo','result'=>'update','values'=>$values)); } 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 a44e9d2d..a02734f3 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 @@ -70,3 +70,5 @@ span#hintDt {margin-left:5px; font-size:x-small; color:#888; cursor: copy;} span#hintDt span { padding-right:2px; } span#hintDt:hover { color:black; } + + span.hataridoUtaniFeltoltes { margin-left: 2px; font-size: x-small; background-color: #e91e63; border-radius:2px; padding: 0px 2px; color:white; } 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 8f26e848..f12a5b14 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 @@ -212,6 +212,10 @@ #updateWindowSideContent ul li a:hover,#updateWindowSideSubContent ul li a:hover { color:#999 } #updateWindowSideTitle a:hover, #updateWindowSideSubTitle a:hover { color:#999 } + div.sideOraAdatHazifeladat {border-left: solid 0px #888; padding: 4px; background-color: #e91e63; font-size: x-small;} + div.sideOraAdatHazifeladat a { text-decoration:underline; } + div.sideOraAdatHazifeladat a:hover { font-style:italic; } + /* #updateWindowSide h3:before { font-family: 'Elusive-Icons'; font-size:10px; content: "\e0a4"; padding-right:8px;font-weight:100; }*/ .updateWindowSide button.mentes, .updateWindowSide button.torles { margin: 4px 18px; height:2em; border-radius:2px; border: solid 1px white; color:white; background-color: #2196f3;} 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 83d5d6f1..e6e2d4e6 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 @@ -28,6 +28,20 @@ { echo '<p style="color:#aaa;">még nincs kitöltve</p>'; } else { echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); } + if ($ADAT['hazifeladatAdat']['hazifeladatHataridoDt']!='') { + $_lejart = (strtotime(date('Y-m-d H:i:s'))>=strtotime($ADAT['hazifeladatAdat']['hazifeladatHataridoDt'])); + +echo '<style type="text/css"> + div.hatarido { background-color: #f5f5f5; border-radius: 2px; padding-top:10px; padding-bottom:10px; padding-left:10px;} + div.hatarido.lejart { background-color: #bdbdbd; color: white;} +</style> +'; + $_icon = ($_lejart) ? 'icon-ban-circle':'icon-time'; + $_class = ($_lejart) ? 'hatarido lejart':'hatarido'; + echo '<div class="'.$_class.'">'; + echo '<span class="'.$_icon.'"></span> Határidő: '.$ADAT['hazifeladatAdat']['hazifeladatHataridoDt']; + echo '</div>'; + } echo '</fieldset>'."\n"; @@ -65,6 +79,9 @@ 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'])) { + echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; + } echo '</li></ul>'; } @@ -202,8 +219,13 @@ echo '<tr>'; echo '<td class="diakNev diakAdat" data-diakid="'.$diakId.'">'.$ITEM['diakNev'].'</td>'; if (__NAPLOADMIN===true || __VEZETOSEG===true) echo '<td>'.$D['diakLattamDt'].'</td>'; - echo '<td colspan="2" class="'.ekezettelen($D['hazifeladatDiakStatus']).'">'.$D['hazifeladatDiakStatus'].'</td>'; + 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'])) { + echo '<span class="hataridoUtaniFeltoltes">határidő utáni feltöltés</span>'; + } + echo '</td>'; $ADAT['dir'] = 'naplo/haladasi/hazifeladat'; $ADAT['file'] = $D['hazifeladatDiakFilename']; @@ -233,54 +255,5 @@ } - function putHazifeladatDiakOrig($ADAT) { - - if (count($ADAT['hazifeladatDiak'])==0) return false; - - echo formBegin(); - echo '<input type="hidden" name="action" value="lattam" />'; - echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'" />'; - echo '<table class="hazifeladatDiak" cellpadding="1" cellspacing="1">'; - echo '<thead>'; - if (__NAPLOADMIN===true || __VEZETOSEG===true) - echo '<tr><th>diák</th><th>látta</th><th colspan="2">státusz</th><th colspan="1">csatolmány</th><th>láttam</th></tr>'; - else - echo '<tr><th>diák</th><th colspan="2">státusz</th><th colspan="1">csatolmány</th><th>láttam</th></tr>'; - echo '</thead>'; - for ($i=0; $i<count($ADAT['hazifeladatDiak']); $i++) { - $D = $ADAT['hazifeladatDiak'][$i]; - echo '<tr>'; - echo '<td class="diakNev diakAdat" data-diakid="'.$D['diakId'].'">'.$D['diakNev'].'</td>'; - if (__NAPLOADMIN===true || __VEZETOSEG===true) echo '<td>'.$D['diakLattamDt'].'</td>'; - echo '<td>'.$D['hazifeladatDiakStatus'].'</td>'; - echo '<td>'.$D['hazifeladatDiakMegjegyzes'].'</td>'; - - $ADAT['dir'] = 'naplo/haladasi/hazifeladat'; - $ADAT['file'] = $D['hazifeladatDiakFilename']; - $href = href('index.php?page=session&f=download&dir='.$ADAT['dir'].'&file='.$ADAT['file'].'&download=true'); - echo '<td>'; - if ($D['hazifeladatDiakOrigFilename']!='') { - echo '<a href="'.$href.'" target="_blank">'.htmlspecialchars($D['hazifeladatDiakOrigFilename']).'</a> <span class="icon-paper-clip"></span>'; - } - echo '</td>'; - echo '<td style="text-align: center">'; -// if ($ADAT['hazifeladatDiak']['hazifeladatDiakStatus']=='kész') { - if (__TANAR===true) { - if ($D['tanarLattamDt']=='') { - echo '<button type="submit" name="lattam[]" value="'.$D['diakId'].'" class="btnLattamStatusz"><span class="icon-ok-sign"></span> láttam!</button>'; - } else { - echo '<button type="submit" class="btnLattamStatusz lattam"><span class="icon-ok-sign"></span> láttam.</button>'; - } - } else { - if ($D['tanarLattamDt']!='') {echo '<span class="icon-ok-sign" style="color:lightblue"></span>';} - } -// } - echo '</td>'; - echo '</tr>'; - } - echo '</table>'; - echo formEnd(); - - } -?> +?>
\ 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 b5d19f89..ece36953 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 @@ -747,7 +747,7 @@ processJSONOraAdat = function(adat) { content += '<ul><li style="font-style:x-small;">Határidő: '+adat['oraAdat']['hazifeladatHataridoDt']+' <span class="icon-time"></span></li></ul>'; } if (adat['oraAdat']['hazifeladatLeiras']!='') { - content += '<div style="border-left: solid 0px #888; padding: 4px; background-color: #e91e63; font-size: x-small;">'; + content += '<div class="sideOraAdatHazifeladat" sxtyle="border-left: solid 0px #888; padding: 4px; background-color: #e91e63; font-size: x-small;">'; content += adat['oraAdat']['hazifeladatLeiras']; content += '</div>'; } diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index ff844583..df260d9e 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4644 +4645 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index b3aec885..5b6a7746 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -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 +Revision 4645 +32c59157c46a9f7cc850c8d8c750b371 mayor-fenntarto-rev4645.tgz +651b082a2c563e7c04c1cc28720f3b1b mayor-installer-sulix-rev4645.tgz +6cc5495b1320ce5d0315fed2edbc079a mayor-wiki-rev4645.tgz +b660418d027155d4d82d131c8d811930 mayor-installer-rev4645.tgz +9b3be1d5ee811e33aef786bd4667332c mayor-portal-rev4645.tgz +0be48fd4cb4930f3d59cff0e043bb214 mayor-felveteli-rev4645.tgz +85ce809f84e94d88f33b94e69d990ac0 mayor-jatek-rev4645.tgz +574c46fd12cb0d6a1a8dbfc3bce1b778 mayor-locales-jp_JP-rev4645.tgz +2f70947d29180b179a4af3d3677bd598 mayor-locales-de_DE-rev4645.tgz +4897ac638fb9bee6468adfd2c07de96d mayor-locales-en_US-rev4645.tgz +b101ac6d1ccdf125ee09da69396b8406 mayor-naplo-rev4645.tgz +c8ef0da17aa2e3dff7ca4d89082a4a29 mayor-base-rev4645.tgz diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index ff844583..df260d9e 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4644 +4645 @@ -1 +1 @@ -4644 +4645 |