diff options
Diffstat (limited to 'mayor-orig/mayor-naplo/www/skin/classic')
7 files changed, 76 insertions, 12 deletions
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 cc5f8869..a44e9d2d 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 @@ -65,3 +65,8 @@ table.hazifeladatDiak tr td a:hover, fieldset.adatok a:hover { text-decoration:underline; color: cornflowerblue; } table.hazifeladatDiak tr td.kesz { background-color: lightgreen; color:white; text-align:center } + + input.modosit { background-color: #ffeb3b; } + span#hintDt {margin-left:5px; font-size:x-small; color:#888; cursor: copy;} + span#hintDt span { padding-right:2px; } + span#hintDt:hover { color:black; } diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css index 836e0ee2..9fc17d27 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/orarend/orarend.css @@ -90,12 +90,25 @@ table.orarend tbody tr td div.jegyzet { margin:2px; font-size: x-small; } +table.orarend tbody tr td div.hazifeladat { + background-color: #3f51b5; color:white; + background-color: #e91e63; + border-radius:2px; padding:2px; + border: solid 1px white; + margin:2px; + font-size: x-small; +} table.orarend tbody tr td div.jegyzet.publikus0 { } table.orarend tbody tr td div.jegyzet.publikus1 { border: dashed 1px white; } table.orarend tbody tr td div.jegyzet.publikus2 { border: dotted 1px white; } table.orarend tbody tr td div.jegyzet.mase.publikus1 { background-color: #4caf50;} table.orarend tbody tr td div.jegyzet.mase.publikus2 { background-color: #4caf50;} + +table.orarend tbody tr td div.hazifeladat span { padding-right:2px; } +table.orarend tbody tr td div.hazifeladat.tanarLattam { background-color: #2E7D32;} +table.orarend tbody tr td div.hazifeladat.diakKesz { background-color: #4CAF50;} + table.orarend tbody tr.orarendJegyzetSor th { background-color: orange; border-color: orange; font-weight:normal; font-size: x-small; cursor: pointer} table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer { background-color: cornflowerblue; } table.orarend tbody tr.orarendJegyzetSor td.jegyzetContainer div:hover { border-color: #bbb; transition : border 50ms ease-out;} @@ -215,7 +228,6 @@ div.unfinished { table.orarend span.cimke_4 { background-color: #673ab7; } - h2.mayorSocialEdition { text-align: center; background-color: #f06; 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 e03ac99a..83d5d6f1 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 @@ -107,7 +107,7 @@ 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'])) { + if ($ADAT['oraAdat']['oraId']>0 && strtotime(date('Y-m-d'))>=strtotime($ADAT['oraAdat']['dt']) && $ADAT['oraAdat']['oraBeirhato']===true) { echo '<input type="text" name="oraLeiras" value="'.$ADAT['oraAdat']['leiras'].'" style="width:70%">'; echo '<input type="submit">'; } else { @@ -116,6 +116,7 @@ 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>'; @@ -151,6 +152,13 @@ echo '<input type="checkbox" name="hazifeladatFeltoltesEngedely" id="hazifeladatFeltoltesEngedelyChk" value="1" '.$_CHK.'/>'; echo '<label for="hazifeladatFeltoltesEngedelyChk">Diák/Szülő házi feladat csatolás engedélyezve</label>'; echo '</div>'; + echo 'Leadási határidő: <input type="text" class="datetime" name="hazifeladatHataridoDt" id="hazifeladatHataridoDt" value="'.$ADAT['hazifeladatAdat']['hazifeladatHataridoDt'].'" placeholder="nem kötelező">'; + if ($ADAT['kovetkezoOraAdat']['oraId']>0) { + echo '<span id="hintDt" data-hintdt="'.$ADAT['kovetkezoOraAdat']['dt'].' 08:00:00">'; + echo '<span class="icon-circle-arrow-left"></span>'; + echo 'következő tervezett óra: '.$ADAT['kovetkezoOraAdat']['dt']; + echo '</span>'; + } echo '<div style="width:100%; margin:auto; text-align:center;">'; echo '<input type="submit" class="btnSubmit">'; echo '</div>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml index 77ad0bce..f36850bc 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/orarend/orarend.phtml @@ -24,11 +24,7 @@ function putOrarend($ADAT) { global $aHetNapjai,$skin; - // $ADAT['utolsoorak'][$teremId]['oraId'] - - /* Képzés-Mátrix */ - //dump($ADAT['kepzesOraterv']); if (is_array($ADAT['kepzesOraterv']) && count($ADAT['kepzesOraterv'])>0) { $kepzes_figyel = true; $KEPZES_MATRIX[2]=$ADAT['kepzesOraterv']['első nyelv']['sum']; @@ -37,7 +33,6 @@ +$ADAT['kepzesOraterv']['kötelezően választható']['sum'] +$ADAT['kepzesOraterv']['szabadon választható']['sum'] ; - //dump($KEPZES_MATRIX); } else $kepzes_figyel = false; // ---------------- $multiTelephely = (count($ADAT['orarend']['telephelyIdk'])>1); @@ -152,10 +147,10 @@ } echo '<tbody>'."\n"; // echo '<caption>'.$het.'. heti órarend</caption>'; - if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; } + if (count($ADAT['dolgozat']['tervezett'])>0 || count($ADAT['jegyzet'])>0 || (is_array($ADAT['hazifeladat']) && count($ADAT['hazifeladat'])>0)) { $_jegyzetSorCss = ''; } else { $_jegyzetSorStyle = 'display:none;'; } echo '<tr id="orarendJegyzetSor" class="orarendJegyzetSor" style="'.$_jegyzetSorStyle.'">'; echo '<th>'; - echo 'dolgozatok, jegyzetek'; + echo 'dolgozatok, jegyzetek, határidők'; // echo '<span class="icon-info-sign"></span>'; echo '</th>'; for ($nap=1;$nap<=$ADAT['hetiMaxNap'];$nap++) { @@ -192,6 +187,30 @@ echo '</div>'; } } + + //for ($d=0; $d<count($ADAT['hazifeladat'][$dt]); $d++) { + if (is_array($ADAT['hazifeladat'][$dt]) && count($ADAT['hazifeladat'][$dt])>0) { + for ($_h=0; $_h<count($ADAT['hazifeladat'][$dt]); $_h++) { + $_HF = $ADAT['hazifeladat'][$dt][$_h]; + $_oraId = $_HF['oraId']; + $_str = ''; + // hazifeladatDiakStatus, diakLattamDt, tanarLattamDt, hazifeladatFeltoltesiEngedely + if ($_HF['hazifeladatFeltoltesEngedely']) { + if ($_HF['tanarLattamDt']!='') { $_hfIcon = 'icon-ok-sign'; $_str = 'elfogadva'; } + elseif ($_HF['hazifeladatDiakStatus']!='') { $_hfIcon = 'icon-ok-circle'; $_str = 'feltöltve';} + else {$_hfIcon = 'icon-paper-clip-alt'; $_str = 'leadási határidő';} + } else { + if ($_HF['tanarLattamDt']!='') { $_hfIcon = 'icon-ok'; $_str = 'elfogadva';} + elseif ($_HF['hazifeladatDiakStatus']!='') { $_hfIcon = 'icon-ok-circle'; $_str = 'kész';} + else {$_hfIcon = 'icon-home-alt'; $_str='határidő';} + } + if ($_HF['tanarLattamDt']!='') $_hfClass = 'tanarLattam'; + elseif ($_HF['hazifeladatDiakStatus']!='') $_hfClass = 'diakKesz'; + else $_hfClass = ''; + echo '<div class="hazifeladat oraAdat '.$_hfClass.'" data-oraid="'.$_oraId.'" data-hazifeladatid="'.$x.'"><span class="'.$_hfIcon.'"></span>házifeladat '.$_str.'<br/>'.$_HF['tankorNev'].'</div>'; + } + } + //} echo '</td>'; } echo '</tr>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml index 24304570..a7302388 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/uzeno/uzeno.phtml @@ -124,7 +124,8 @@ $href_szal = href('index.php?page=naplo&sub=uzeno&f=uzeno&szalId='.$D['feladoId'].'_'.$D['feladoTipus'].'_'.$D['cimzettId'].'_'.$D['cimzettTipus'].'&mId='.$D['mId'],array('sessionID','lang','policy')); // $D['txt'] = '<a href="'.$href_szal.'">'.nl2br(htmlspecialchars($D['txt'])).'</a>'; - $D['txt'] = makelinksclickable(nl2br(supertext($D['txt']))); + // $D['txt'] = makelinksclickable(nl2br(supertext($D['txt']))); + $D['txt'] = (nl2br(supertext($D['txt']))); echo (mb_substr($D['txt'],0,2000,'UTF-8')); if (mb_strlen($D['txt'],'UTF-8')>2000) { echo ' <a class="more" href="'.$href.'">...</a>'; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js index 4d225a86..a8e1d250 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/javascript/haladasi/hazifeladat.jquery.min.js @@ -9,4 +9,11 @@ $(function() { } }); + $('#hintDt').click(function(){ + // console.log($('#hazifeladatHataridoDt').val()); + $('#hazifeladatHataridoDt').addClass('modosit'); + $('#hazifeladatHataridoDt').val($('#hintDt').data('hintdt')); + }); + + });
\ 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 df72b0cb..b5d19f89 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 @@ -727,18 +727,30 @@ processJSONOraAdat = function(adat) { } } + // content += '<h3>Óra kapcsolatai</h3>'; // content += '<ul><li>Beírt mulasztások száma: '+'n/a'+'</li>'; // content += '<li>Beírt jegyek száma: '+'n/a'+'</li>'; // content += '</ul>'; content += '<h3>Házi feladat '; - content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'"><span class="icon-resize-full"></span></a>'; + content += '<a href="'+href({'page':'naplo','sub':'haladasi','f':'hazifeladat','oraId':adat['oraAdat']['oraId']})+'">'; + if (adat['oraAdat']['hazifeladatFeltoltesEngedely']==1) { + content += '<span class="icon-paper-clip"></span>'; + } else { + content += '<span class="icon-resize-full"></span>'; + } + content += '</a>'; content += '</h3>'; if (adat['oraAdat']['hazifeladatId']>0) { - content += '<div style="border-left: solid 0px #888; padding: 4px; background-color:#444;">'; + if (adat['oraAdat']['hazifeladatHataridoDt']!=null) { + 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 += adat['oraAdat']['hazifeladatLeiras']; content += '</div>'; + } } content += '<h3>Dolgozatok</h3>'; |