diff options
| author | M.Gergo | 2020-06-04 14:25:03 +0200 |
|---|---|---|
| committer | M.Gergo | 2020-06-04 14:25:03 +0200 |
| commit | 99481ab82a386c30d970592c5b8804e5c8e6df6e (patch) | |
| tree | 976e4dcf8bc5bab11ec9a40fa33cbcd2631d7920 /mayor-orig/mayor-naplo | |
| parent | 2b0a27070679ce94cf13a80fb207be9218491afe (diff) | |
| download | mayor-99481ab82a386c30d970592c5b8804e5c8e6df6e.tar.gz mayor-99481ab82a386c30d970592c5b8804e5c8e6df6e.zip | |
Rev: 4653rev4653
Diffstat (limited to 'mayor-orig/mayor-naplo')
3 files changed, 5 insertions, 4 deletions
diff --git a/mayor-orig/mayor-naplo/log/mayor-naplo.rev b/mayor-orig/mayor-naplo/log/mayor-naplo.rev index 146427d5..b5859656 100644 --- a/mayor-orig/mayor-naplo/log/mayor-naplo.rev +++ b/mayor-orig/mayor-naplo/log/mayor-naplo.rev @@ -1 +1 @@ -4652 +4653 diff --git a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php index 994956de..7fc0a8de 100644 --- a/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php +++ b/mayor-orig/mayor-naplo/www/policy/private/naplo/osztalyozo/stat-pre.php @@ -256,8 +256,10 @@ // záradékhoz (2015) $ADAT['diakAdat'][$diakId]['bukottTargy'][] = $ADAT['targyAdat'][$targyId]['targyNev']; } - if (isset($jegyAdat['megjegyzes']) && $zaraskorTag) { - $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++; + if ($zaraskorTag) { + if (isset($jegyAdat['megjegyzes'])) { + $ADAT['stat'][ $jegyAdat['megjegyzes'] ]++; + } if (in_array($jegyAdat['jegyTipus'],array('jegy','féljegy'))) { $ADAT['jegyEloszlas'][$targyId][$jegyAdat['jegy']]++; if (!in_array($targyId,array_merge($ADAT['szorgalomTargyIdk'],$ADAT['magatartasTargyIdk'])) && $zaraskorTag) $ADAT['jegyEloszlas']['osszes'][$jegyAdat['jegy']]++; diff --git a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml index 10f7e7f8..13d639f5 100644 --- a/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml +++ b/mayor-orig/mayor-naplo/www/skin/classic/module-naplo/html/osztalyozo/stat.phtml @@ -531,7 +531,6 @@ echo '/'; echo '<span title="'._OSSZES_JEGY_ATLAGA.'">'.number_format($ADAT['tantargyiAtlagok']['osztaly'], 2, ',', '.').'</span>'; echo '</th>'; - // Félévi átlagok echo '<th colspan="'.($plusCols-2).'" class="atlag">'; if (_BEIRHATO) echo '<input type="submit" class="felev1" name="tipus" value="'._BEIR.'" />'; |