diff options
19 files changed, 90 insertions, 38 deletions
diff --git a/mayor-orig/mayor-base/log/mayor-base.rev b/mayor-orig/mayor-base/log/mayor-base.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-base/log/mayor-base.rev +++ b/mayor-orig/mayor-base/log/mayor-base.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev +++ b/mayor-orig/mayor-felveteli/log/mayor-felveteli.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev +++ b/mayor-orig/mayor-fenntarto/log/mayor-fenntarto.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-installer-orig/log/mayor-installer.rev +++ b/mayor-orig/mayor-installer-orig/log/mayor-installer.rev @@ -1 +1 @@ -4622 +4623 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 25199c9d..899315a9 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 @@ -4622 +4623 diff --git a/mayor-orig/mayor-jatek/log/mayor-jatek.rev b/mayor-orig/mayor-jatek/log/mayor-jatek.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-jatek/log/mayor-jatek.rev +++ b/mayor-orig/mayor-jatek/log/mayor-jatek.rev @@ -1 +1 @@ -4622 +4623 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 25199c9d..899315a9 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 @@ -4622 +4623 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 25199c9d..899315a9 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 @@ -4622 +4623 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 25199c9d..899315a9 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 @@ -4622 +4623 diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php index eea20314..6799d19e 100644 --- a/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php +++ b/mayor-orig/mayor-naplo/www/lang/hu_HU/module-naplo/haladasi/hazifeladat.php @@ -36,6 +36,6 @@ define('_BEALLITASAI', 'beállításai'); define('_ALAPADATOK','Óra adatok'); - define('_HAZIFELADAT','Házi feladat'); + define('_HAZIFELADAT','Házi feladat, Részletek, Referenciák, Hivatkozások'); ?> 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 79d49bd0..3dbf4c9d 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 @@ -110,7 +110,6 @@ if ( $skin == 'ajax' // set defaults ++ // if (strtotime($igDt) > strtotime($_TANEV['zarasDt'])) $igDt = $_TANEV['zarasDt']; $maxIgDt = date('Y-m-d', strtotime('next Saturday', strtotime($_TANEV['kovetkezoKezdesDt']))); - if (strtotime($igDt) > strtotime($maxIgDt)) $igDt = $maxIgDt; elseif (strtotime($igDt) < strtotime($_TANEV['kezdesDt'])) $igDt = $_TANEV['kezdesDt']; if (date('w', strtotime($igDt)) == 0) $igDt = date('Y-m-d',strtotime('-1 days',strtotime($igDt))); // Hogy vasárnap még a múltheti látszódjon @@ -130,6 +129,7 @@ if ( $skin == 'ajax' // Vasárnap $igDt = date('Y-m-d',strtotime('Sunday',strtotime($tolDt))); } + 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. @@ -175,6 +175,15 @@ if ( $skin == 'ajax' // || ((__TANAR || __VEZETOSEG ) && __FOLYO_TANEV) // A tanév közben a tanároknak, vezetőségi tagoknak - az év végi napok problémásak így! ) ) { + // checkNaplo (2020) + /* + checkNaplo($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/policy/private/naplo/haladasi/hazifeladat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/haladasi/hazifeladat-pre.php index a4a1e696..ba0a27c4 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 @@ -23,14 +23,14 @@ $ADAT['oraId' ] = $oraId = readVariable($_POST['oraId'],'id',readVariable($_GET['oraId'],'id')); // $ADAT['hazifeladatId' ] = $hazifeladatId = readVariable($_POST['hazifeladatId'],'id', readVariable($_GET['hazifeladatId'],'id')); $ADAT['hazifeladatLeiras' ] = readVariable($_POST['hazifeladatLeiras'],'string'); - $ADAT['oraAdat'] = getOraadatById($oraId); $action = readVariable($_POST['action'],'strictstring',null,array('hazifeladatBeiras')); $q = "SELECT hazifeladatId FROM oraHazifeladat WHERE oraId=%u"; $values = array($ADAT['oraId']); $ADAT['hazifeladatId'] = $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'value','values'=>$values)); + $ADAT['oraAdat'] = getOraadatById($oraId); - if ($action=='hazifeladatBeiras') { + if (__TANAR===true && $action=='hazifeladatBeiras') { if ($hazifeladatId>0) { // update $q = "UPDATE oraHazifeladat set hazifeladatLeiras='%s' WHERE hazifeladatId=%u"; @@ -40,13 +40,18 @@ $q = "INSERT IGNORE INTO oraHazifeladat (hazifeladatLeiras,oraId) VALUES ('%s',%u)"; $values = array($ADAT['hazifeladatLeiras'],$ADAT['oraId']); $hazifeladatId = db_query($q, array('modul'=>'naplo','result'=>'insert','values'=>$values)); - } + } + if ($oraId>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) { + $leiras = readVariable($_POST['oraLeiras'],'string'); + updateHaladasiNaploOra($oraId, $leiras); + } } $q = "SELECT * FROM oraHazifeladat WHERE oraId=%u"; $values = array($ADAT['oraId']); $ADAT['hazifeladatAdat'] = db_query($q, array('modul'=>'naplo','result'=>'record','values'=>$values)); + $ADAT['oraAdat'] = getOraadatById($oraId); $TOOL['vissza'] = array('tipus'=>'vissza', 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 acf8fcae..e2b6d3ef 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 @@ -11,32 +11,70 @@ echo '<fieldset class="adatok"><legend>'._ALAPADATOK.'</legend>'."\n"; - echo superdate($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – <span class="tankorNev" data-tankorid="'.$ADAT['oraId']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span> – '.$ADAT['oraAdat']['kiCn']; - - echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; + echo ($ADAT['oraAdat']['dt']).' ('.$ADAT['oraAdat']['dt'].'), '.$ADAT['oraAdat']['ora'].'. '._ORA.' – <span class="tankorNev" data-tankorid="'.$ADAT['oraId']['tankorId'].'">'.$ADAT['oraAdat']['tankorNev'].'</span> – '.$ADAT['oraAdat']['kiCn']; + // echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; echo '</fieldset>'."\n"; if (__DIAK===true) { + echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n"; + if ($ADAT['oraAdat']['leiras']=='') + { echo '<p style="color:#aaa;">még nincs kitöltve</p>'; } + else + { echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; } + echo '</fieldset>'."\n"; echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n"; - echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); + if ($ADAT['hazifeladatAdat']['hazifeladatLeiras']=='') + { echo '<p style="color:#aaa;">még nincs kitöltve</p>'; } + else + { echo ($ADAT['hazifeladatAdat']['hazifeladatLeiras']); } echo '</fieldset>'."\n"; } else { - echo '<script src="//cdn.ckeditor.com/4.14.0/basic/ckeditor.js"></script>'; + echo '<script src="//cdn.ckeditor.com/4.14.0/standard/ckeditor.js"></script>'; if ($skin != 'ajax') formBegin(array('class'=>'hazifeladat')); echo '<input type="hidden" name="action" value="hazifeladatBeiras"/>'; echo '<input type="hidden" name="oraId" value="'.$ADAT['oraAdat']['oraId'].'"/>'; echo '<input type="hidden" name="hazifeladatId" value="'.$ADAT['hazifeladatId'].'"/>'; + echo '<fieldset class="adatok"><legend>'.ucfirst(_TANANYAG).'</legend>'."\n"; + if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt'])) { + echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">'; + echo '<input type="submit">'; + } else { + echo '<p>'.$ADAT['oraAdat']['leiras'].'</p>'; + } + echo '</fieldset>'."\n"; + echo '<fieldset class="adatok"><legend>'._HAZIFELADAT.'</legend>'."\n"; echo '<textarea name="hazifeladatLeiras" class="wysiwyg" rows="10" cols="80" style="width:100%">'; echo htmlspecialchars($ADAT['hazifeladatAdat']['hazifeladatLeiras']); echo '</textarea>'; echo " <script> - CKEDITOR.replace( 'hazifeladatLeiras' ); + CKEDITOR.replace( 'hazifeladatLeiras', { + disableNativeSpellChecker: true, + language: 'hu', + + toolbarGroups: [ + { name: 'basicstyles', groups: [ 'basicstyles', 'cleanup' ] }, + { name: 'paragraph', groups: [ 'list', 'indent' ] }, + { name: 'links' }, +// { name: 'document', groups: [ 'mode', 'document', 'doctools' ] }, + { name: 'clipboard', groups: [ 'undo', 'redo' ] }, +// { name: 'editing', groups: [ 'find', 'selection', 'spellchecker' ] }, +// { name: 'forms' }, +// { name: 'insert' }, +// { name: 'styles' }, +// { name: 'colors' }, +// { name: 'others' }, + { name: 'insert', groups: [ 'Image', 'Table', 'HorizontalRule' ] }, + { name: 'tools' }, +// { name: 'about' } + ], + removeButtons: 'Cut,Copy,Paste,PasteText,PasteFromWord,Anchor,Underline,Strike,SpecialChar,HorizontalRule' + }); </script>"; echo '<input type="submit">'; echo '</fieldset>'."\n"; diff --git a/mayor-orig/mayor-portal/log/mayor-portal.rev b/mayor-orig/mayor-portal/log/mayor-portal.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-portal/log/mayor-portal.rev +++ b/mayor-orig/mayor-portal/log/mayor-portal.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/mayor-wiki/log/mayor-wiki.rev b/mayor-orig/mayor-wiki/log/mayor-wiki.rev index 25199c9d..899315a9 100644 --- a/mayor-orig/mayor-wiki/log/mayor-wiki.rev +++ b/mayor-orig/mayor-wiki/log/mayor-wiki.rev @@ -1 +1 @@ -4622 +4623 diff --git a/mayor-orig/md5sum b/mayor-orig/md5sum index 7bec2863..82496192 100644 --- a/mayor-orig/md5sum +++ b/mayor-orig/md5sum @@ -1,13 +1,13 @@ -Revision 4622 -77fc988ba83363c16c6738ddbd308380 mayor-fenntarto-rev4622.tgz -7ebcf17a8eac7e76f1f12141cd0f2e96 mayor-installer-sulix-rev4622.tgz -ce69839e26be6d241b42a6f809086bd1 mayor-wiki-rev4622.tgz -b3eb3145bc34c87c54fab8249f0047ba mayor-installer-rev4622.tgz -9e9cb66a0f1c39865fc98fb34406b9e5 mayor-portal-rev4622.tgz -05f674da0d20fa113e967e954d282474 mayor-felveteli-rev4622.tgz -4408ca2ac4f652f6951c2bb8a9338e91 mayor-jatek-rev4622.tgz -15ce11f2a3a787e2dbe4bac92af19ce9 mayor-locales-jp_JP-rev4622.tgz -5dfa8019872de879f6ca9118c5168982 mayor-locales-de_DE-rev4622.tgz -d8796bed93ce7b37b6ccd3e47ebe66ad mayor-locales-en_US-rev4622.tgz -baeb25079baf4adbca9b16c15ce476fe mayor-naplo-rev4622.tgz -05b13b23fa3969fcd7568650c5cdbed6 mayor-base-rev4622.tgz +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 diff --git a/mayor-orig/rev.txt b/mayor-orig/rev.txt index 25199c9d..899315a9 100644 --- a/mayor-orig/rev.txt +++ b/mayor-orig/rev.txt @@ -1 +1 @@ -4622 +4623 @@ -1 +1 @@ -4622 +4623 |