Skip to content
New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Refactor/removal of calculate average button (version 3.34.74) #370

Merged
merged 2 commits into from
Jul 6, 2023
Merged

Refactor/removal of calculate average button (version 3.34.74) #370

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
42238de
fix: commented code button and js event
Jul 5, 2023
a39edb9
refactor: update TAG version
Jul 5, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 2 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
# Atualizações

## [Versão 3.34.74]
- O botão inoperante de calcular média na página de notas foi removido

## [Versão 3.28.71]
- Corrigido o estilo do alerta de quadro de horários em aulas ministradas
Expand Down
2 changes: 1 addition & 1 deletion config.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
$debug = getenv("YII_DEBUG");
defined('YII_DEBUG') or define('YII_DEBUG', $debug);

define("TAG_VERSION", '3.33.73');
define("TAG_VERSION", '3.34.74');


define("YII_VERSION", Yii::getVersion());
Expand Down
40 changes: 20 additions & 20 deletions js/enrollment/grades/_initialization.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -162,23 +162,23 @@ $(document).on("keyup", "input.grade", function (e) {
this.value = val;
});

$(document).on("click", ".calculate-media", function (e) {
e.preventDefault();
$(".js-grades-alert").hide();
$.ajax({
type: "POST",
url: "?r=enrollment/calculateFinalMedia",
cache: false,
data: {
classroom: $("#classroom").val(),
discipline: $("#discipline").val(),
},
beforeSend: function () {
$(".js-grades-loading").css("display", "inline-block");
$(".js-grades-container, .grades-buttons").css("opacity", "0.4").css("pointer-events", "none");
},
success: function (data) {
$("#discipline").trigger("change");
},
});
});
// $(document).on("click", ".calculate-media", function (e) {
// e.preventDefault();
// $(".js-grades-alert").hide();
// $.ajax({
// type: "POST",
// url: "?r=enrollment/calculateFinalMedia",
// cache: false,
// data: {
// classroom: $("#classroom").val(),
// discipline: $("#discipline").val(),
// },
// beforeSend: function () {
// $(".js-grades-loading").css("display", "inline-block");
// $(".js-grades-container, .grades-buttons").css("opacity", "0.4").css("pointer-events", "none");
// },
// success: function (data) {
// $("#discipline").trigger("change");
// },
// });
// });
2 changes: 1 addition & 1 deletion themes/default/views/enrollment/grades.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@
<div class="span12">
<h1><?php echo Yii::t('default', 'Grades'); ?></h1>
<div class="buttons row grades-buttons">
<button class='t-button-primary calculate-media'>Calcular Média</button>
<!--<button class='t-button-primary calculate-media'>Calcular Média</button>-->
<button id="save"
class='t-button-primary hidden-print no-show'><?php echo Yii::t('default', 'Save') ?>
</button>
Expand Down