Skip to content
New issue

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

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

Already on GitHub? Sign in to your account

Fix line/area graph (broken after recent changes) #2380

Merged
merged 4 commits into from
Oct 1, 2022

Conversation

rdwebdesign
Copy link
Member

@rdwebdesign rdwebdesign commented Sep 30, 2022

What does this PR aim to accomplish?

Fix 3 small issues:

How does this PR accomplish the above?

  • Re-add the function to fill the "gaps" with zeros;
  • Simplify SQL using a single query to retrieve both values (domains and blocked queries) using the exact same timestamps.
  • Add queries with codes 15 or 16 to the blocked count.

What documentation changes (if any) are needed to support this PR?

none


By submitting this pull request, I confirm the following:

  1. I have read and understood the contributors guide, as well as this entire template. I understand which branch to base my commits and Pull Requests against.
  2. I have commented my proposed changes within the code and I have tested my changes.
  3. I am willing to help maintain this change if there are issues with it later.
  4. It is compatible with the EUPL 1.2 license
  5. I have squashed any insignificant commits. (git rebase)

  • I have read the above and my PR is ready for review. Check this box to confirm

…he data

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
…ocked queries.

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign rdwebdesign requested a review from a team September 30, 2022 20:59
Copy link
Member

@yubiuser yubiuser left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do we still need

    $stmt->bindValue(':from', $from, SQLITE3_INTEGER);
    $stmt->bindValue(':until', $until, SQLITE3_INTEGER);

api_db.php Outdated Show resolved Hide resolved
@rdwebdesign
Copy link
Member Author

rdwebdesign commented Sep 30, 2022

Do we still need

    $stmt->bindValue(':from', $from, SQLITE3_INTEGER);
    $stmt->bindValue(':until', $until, SQLITE3_INTEGER);

Yes. :from and :until are used on the WHERE clause. They are in $limit variable.

rdwebdesign and others added 2 commits September 30, 2022 18:48
Co-authored-by: yubiuser <ckoenig@posteo.de>
Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
- 15: Blocked (database is busy)
- 16: Blocked (special domain)

Signed-off-by: RD WebDesign <github@rdwebdesign.com.br>
@rdwebdesign rdwebdesign requested a review from a team October 1, 2022 03:51
@rdwebdesign rdwebdesign merged commit 0508868 into devel Oct 1, 2022
@rdwebdesign rdwebdesign deleted the fix/db_graph_area branch October 1, 2022 06:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants