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

Tweak main activity graph #2956

Merged
merged 5 commits into from
Mar 16, 2024
Merged

Tweak main activity graph #2956

merged 5 commits into from
Mar 16, 2024

Conversation

DL6ER
Copy link
Member

@DL6ER DL6ER commented Feb 11, 2024

What does this implement/fix?

The permitted column in the main graph was actually the sum of forwarded and other queries. As cache is arguably somehow permitted, too, make the difference between them clear.

Note

Needs pi-hole/FTL#1884 to be checked out


Related issue or feature (if applicable): https://discourse.pi-hole.net/t/dashboard-graphs-dont-match/68263

Pull request in docs with documentation (if applicable): N/A


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.
  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)

Checklist:

  • The code change is tested and works locally.
  • I based my code and PRs against the repositories developmental branch.
  • I signed off all commits. Pi-hole enforces the DCO for all contributions
  • I signed all my commits. Pi-hole requires signatures to verify authorship
  • I have read the above and my PR is ready for review.

…ded and other queries. As cache is arguably somehow permitted, too, make the difference between them clear

Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
Signed-off-by: DL6ER <dl6er@dl6er.de>
@DL6ER DL6ER marked this pull request as ready for review February 14, 2024 18:18
@DL6ER
Copy link
Member Author

DL6ER commented Feb 15, 2024

Has been confirmed working on the related Discourse thread

@rdwebdesign
Copy link
Member

In v5 the first graphic had only 2 items.

Now it has 4 items. I will improve themes to make easier to distinguish them.

colors

Copy link
Contributor

github-actions bot commented Mar 4, 2024

This pull request has conflicts, please resolve those before we can evaluate the pull request.

@sawsanders
Copy link

I’ve been on this branch for a month or so now. Other than the colors @rdwebdesign wants to fix, it has been running just fine and I haven’t noticed any other issues.

Thanks!!

@rdwebdesign
Copy link
Member

Note:

The code is working.
The new colors and visual improvements can be added in a future PR.

Copy link
Contributor

Conflicts have been resolved.

Signed-off-by: DL6ER <dl6er@dl6er.de>
Copy link
Member

@PromoFaux PromoFaux left a comment

Choose a reason for hiding this comment

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

Approving based on testing used comments

@DL6ER DL6ER merged commit 71d396e into development-v6 Mar 16, 2024
8 checks passed
@DL6ER DL6ER deleted the fix/overTimeGraphs branch March 16, 2024 18:57
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants