diff options
Diffstat (limited to 'mayor-orig/mayor-naplo')
6 files changed, 48 insertions, 10 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index f201ebe0..3f4f4b89 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4640 +4641 diff --git a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php index 602f26e1..60ddb4fa 100644 --- a/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php +++ b/mayor-orig/mayor-naplo/www/include/modules/naplo/share/ora.php @@ -24,16 +24,20 @@ tankorNev, feladatTipusId, munkaido, - hazifeladatId, hazifeladatLeiras + hazifeladatId, + hazifeladatLeiras, + cimkeId, cimkeLeiras FROM `%s`.ora LEFT JOIN `%s`.oraHazifeladat USING (oraId) + LEFT JOIN `%s`.oraCimke USING (oraId) + LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) LEFT JOIN ".__INTEZMENYDBNEV.".tankorSzemeszter USING (tankorId) LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t1 ON ki=t1.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".tanar AS t2 ON kit=t2.tanarId LEFT JOIN ".__INTEZMENYDBNEV.".feladatTipus USING (feladatTipusId) LEFT JOIN ".__INTEZMENYDBNEV.".terem USING (teremId) WHERE oraId=%u AND (tanev=%u OR feladatTipusId IS NOT NULL)"; - $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); + $v = array(tanevDbNev(__INTEZMENY, $tanev),tanevDbNev(__INTEZMENY, $tanev), tanevDbNev(__INTEZMENY, $tanev), $oraId, $tanev); return db_query($q, array('fv' => 'getOraAdatById', 'modul' => 'naplo_intezmeny', 'result' => 'record', 'values' => $v), $olr); } else { @@ -349,6 +353,8 @@ } else { $q = "SELECT * FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; array_unshift($v, $tolDt, $igDt, $tanarId, $tanarId); if ($SET['result']=='assoc') @@ -389,13 +395,19 @@ WHERE dt>='%s' and dt<='%s' AND (ki=%u OR kit=%u) $WHERE ORDER BY dt,ora"; $RE = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); } else { if ($SET['elmaradokNelkul']) - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).") AND tipus NOT IN ('elmarad','elmarad máskor')"; else - $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime FROM ora + $q = "SELECT *,getOraTolTime(ora.oraId) AS tolTime,getOraIgTime(ora.oraId) AS igTime, cimkeId, cimkeLeiras +FROM ora LEFT JOIN oraHazifeladat USING (oraId) +LEFT JOIN oraCimke USING (oraId) +LEFT JOIN ".__INTEZMENYDBNEV.".cimke USING (cimkeId) WHERE dt>='%s' and dt<='%s' AND tankorId IN (".implode(',', array_fill(0, count($TANKORIDK), '%u')).")"; $R = db_query($q, array('modul' => 'naplo', 'fv' => 'getOrak', 'result' => 'indexed', 'values' => $v)); $RE['tankorok']=array(); diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css index 4477f75c..b4449090 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/css/haladasi/haladasi.css @@ -316,6 +316,13 @@ td.cimke { text-align:center; white-space: wrap; background-color: rgba(255,255,255,0.3);} td.cimke span.cimke {background-color: orange; color:white; font-size:x-small; padding:0px 2px; border-radius: 2px; margin:2px;} + td.cimke span.cimke_0 { background-color: #4caf50; } + td.cimke span.cimke_1 { background-color: red; } + td.cimke span.cimke_2 { background-color: orange; } + td.cimke span.cimke_3 { background-color: #3f51b5; } + td.cimke span.cimke_4 { background-color: #673ab7; } + + } @media print { table.haladasiBejegyzesek thead tr th { border-bottom: solid 1px 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 fab07933..836e0ee2 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 @@ -207,6 +207,15 @@ div.unfinished { table.orarend div.orarendTools span.dolgozat:hover { color: orange;} table.orarend div.orarendTools span.bezar:hover { color: #f06; } + table.orarend span.cimke { margin:0px 1px; border-radius: 2px; font-size:xx-small; color:white; padding: 0px 2px 0px 2px; background-color:#ddd; } + table.orarend span.cimke_0 { background-color: #4caf50; } + table.orarend span.cimke_1 { background-color: red; } + table.orarend span.cimke_2 { background-color: orange; } + table.orarend span.cimke_3 { background-color: #3f51b5; } + 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/haladasi.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml index ce15cd4d..fa46ad2c 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/haladasi/haladasi.phtml @@ -53,7 +53,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo '</th>'; - echo '<th colspan="8" class="fejlec8">'; + echo '<th colspan="9" class="fejlec8">'; if ($tanarId!='') { echo '<span class="tanarNev" data-tanarid="'.$tanarId.'">'.$title.'</span>'; if ($ADAT['csakUres']==true) { @@ -106,7 +106,7 @@ echo ($ADAT['oraTerheles'][$ADAT['tanarId']]['ossz']['heti']); } echo '</th>'; - echo '<th colspan="8">'; + echo '<th colspan="10">'; // if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo '<input class="gomb" type="submit" name="lapoz" value="<<" tabindex="5" />'."\n"; if (_SHOW_DAYS_FROM > $_TANEV['kezdesDt']) echo '<button class="gomb" type="submit" name="lapoz1" value="prevWeek" tabindex="7"><span class="icon-chevron-left"></span></button>'; @@ -197,7 +197,7 @@ if (__PLUSZBEIRHAT===true && !$jovoDt) echo '<div class="icon-plus-sign rejtMutat"></div>'; echo '</th>'."\n"; // Az első cella a dátum/nap - echo '<th colspan="8" class="nap">'; + echo '<th colspan="9" class="nap">'; echo str_replace('-','.',$dt) .'. '; echo '<span class="napNev">'.$aHetNapjai[(date('w',$time)+6)%7].'</span>'; if ($napInfo2['napszam']!='' || $napInfo['orarendiHet'] != 0) { @@ -237,7 +237,7 @@ if (__PLUSZBEIRHAT===true) putUjOra(array('dt'=>$dt, 'ora'=>$j)); } } else { - echo '<tr><th colspan="9" class="nincsOra">'._NINCS_ORAJA.'</th></tr>'; + echo '<tr><th colspan="10" class="nincsOra">'._NINCS_ORAJA.'</th></tr>'; // if ($tanitasiNap && strtotime(date('Y-m-d'))>=strtotime($dt)) { // if ( // (strtotime(date('Y-m-d'))>=strtotime($dt) @@ -523,9 +523,14 @@ for ($c = 0; $c<count($ADAT['cimkek']); $c++) { if (in_array($ADAT['cimkek'][$c]['cimkeId'], $dOra['cimke'])) $_C[] = $ADAT['cimkek'][$c]['cimkeLeiras']; } - if (count($_C)>0) echo '<span class="cimke">'.implode('</span> <span class="cimke">',$_C).'</span>'; + if (count($_C)>0) { // vigyázz, csak egy címke engedélyezett! (egyelőre, különben sérül a getHaladasi) + $_cimkeId = $dOra['cimke'][0]; + echo '<span class="cimke cimke_'.$_cimkeId.'">'.implode('</span> <span class="cimke">',$_C).'</span>'; + } } } + echo '</td>'; + echo '<td class="cimke">'; echo '<a href="'.href('index.php?page=naplo&sub=haladasi&f=hazifeladat&oraId='.$dOra['oraId'].'&hazifeladatId='.$ADAT['tankorHazifeladat'][ $dOra['oraId'] ]).'" class="onClickUpdateWindow" title="'._HAZIFELADAT.'">'; 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 5c75bfb6..77ad0bce 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 @@ -274,6 +274,11 @@ echo '<span class="'.$_icon.'" title="h.f." style="color:'.$_hfcolor.'; padding-right:2px;"></span>'; } + if ($_ORA['cimkeLeiras']!='') { + $_cimkeMod = intval($_ORA['cimkeId']) % 5; + echo '<span class="cimke cimke_'.$_cimkeMod.'">'.$_ORA['cimkeLeiras'].'</span>'; + } + if (is_array($_hianyzasAdat)) { echo '<span class="hianyzasTicker '.ekezettelen($_hianyzasAdat['hTipus']).' '.ekezettelen($_hianyzasAdat['statusz']).' '.ekezettelen($_hianyzasAdat['igazolas']).'">'; if ($_hianyzasAdat['hTipus']=='hiányzás') |