mirror_php/moodle
1
0
Fork 0
mirror of https://github.com/moodle/moodle.git synced 2025-01-18 05:58:34 +01:00
Code Issues Projects Releases Wiki Activity

MDL-70854 core: Rewrite logic for determining whether to update progress

Browse Source 
Rewriting, especially to prevent empty if-blocks.
This commit is contained in:
Jun Pataleta 2024-07-24 10:39:15 +08:00
parent 467fa44233
commit 6c82a2e9d2
No known key found for this signature in database
GPG Key ID: F83510526D99E2C7
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
lib/classes/output/progress_bar.php
View File

@ -163,13 +163,15 @@ class progress_bar implements renderable, templatable {
$estimate = $this->estimate($percent);
if ($estimate === null) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
// Always do the first and last updates.
} else if ($estimate == 0) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
// Always do the last updates.
} else if ($this->lastupdate + 20 < time()) { // phpcs:ignore Generic.CodeAnalysis.EmptyStatement.DetectedIf
// We must update otherwise browser would time out.
} else if (round($this->percent, 2) === round($percent, 2)) {
// Always do the first and last updates. Estimate would be null in the beginning and 0 at the end.
$isfirstorlastupdate = empty($estimate);
// We need to update every 20 seconds since last update to prevent browser timeout.
$timetoupdate = $this->lastupdate + 20 < time();
// Whether the progress has moved.
$issameprogress = round($this->percent, 2) === round($percent, 2);
// No need to update if it's not yet time to update and there's no progress.
if (!$isfirstorlastupdate && !$timetoupdate && $issameprogress) {
return;
}