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

[weather] add humidity to hourly view, fix spacing error when using UV Index, add config option to hide precipitation entries that are zero #3526

Closed
wants to merge 14 commits into from

Conversation

OWL4C
Copy link
Contributor

@OWL4C OWL4C commented Aug 29, 2024

Basically the title. Just some existing weather data included into hourly, some config option ("hideZeroes") to hide precipitation when it is zero (this actually shrinks the entire table, removing columns that are completely empty), and add a spacing column to fix the UV Index column.

I don't understand why CHANGELOG.md is broken, i accidentally did my changes to my master, so i just took the current dev branch changelog and copied it into my master changelog, added my edits, and commited. This shouldn't conflict but it does

@sdetweil
Copy link
Collaborator

automerge is turned off..
you have a conflict in the CHANGELOG.md

@OWL4C
Copy link
Contributor Author

OWL4C commented Aug 29, 2024

I hope this fixed it. It may have broken my fork but that is irrelevant, the changes proposed seem fine.

@OWL4C OWL4C marked this pull request as ready for review August 29, 2024 16:39
@rejas
Copy link
Collaborator

rejas commented Aug 30, 2024

Thanks for your PR. Could you attach screenshot sof before and after your changes to this PR here?

@OWL4C
Copy link
Contributor Author

OWL4C commented Aug 30, 2024

Currently:
Screenshot 2024-08-30 at 13 07 35
All functions as mentioned:
Screenshot 2024-08-30 at 13 06 54

However, the need for a spacer is purely the result of a missing css class. I have thus modified the css to include a new (placeholder) class humidity-hourly, as the humidity in the current weather would also be affected by the padding.

.weather .precipitation-amount,
.weather .precipitation-prob,
.weather .humidity-hourly,
.weather .uv-index {
  padding-left: 20px;
  padding-right: 0;
}

What is the naming convention for these classes? As soon as i know what to name the placeholder i will commit a change to remove the spacer from hourly and add the new css class.
(For reference the current css without spacer would look like this:
Screenshot 2024-08-30 at 13 06 28
And the css class with 20px padding looks identical to the 4em whitespace hack)

@OWL4C OWL4C marked this pull request as draft August 30, 2024 13:09
@OWL4C OWL4C marked this pull request as ready for review September 10, 2024 18:17
@OWL4C
Copy link
Contributor Author

OWL4C commented Sep 10, 2024

I just used the placerholder as the actual class name.

Copy link
Collaborator

@rejas rejas left a comment

Choose a reason for hiding this comment

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

sorry for taking so long to review, just some minor things to finish

@@ -21,15 +21,27 @@
{% endif %}
</td>
{% endif %}
{% if config.showHumidity %}
Copy link
Collaborator

Choose a reason for hiding this comment

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

please add the new config options to the defaults object at the top of the file

Copy link
Contributor Author

Choose a reason for hiding this comment

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

Do you mean the defaults in the weather.js?

Copy link
Collaborator

Choose a reason for hiding this comment

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

yes, it is a new config property, so it needs to havea default value set, and the defaults:{} object contains those
as documented in the developers guide for modules

Copy link
Collaborator

Choose a reason for hiding this comment

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

no progress here, @rejas is the missing config.showHumidity the only thing (beside changelog merge conflicts) which is preventing this from merging?

Copy link
Collaborator

Choose a reason for hiding this comment

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

besides that i had one question above...

Copy link
Contributor Author

@OWL4C OWL4C Mar 19, 2025

Choose a reason for hiding this comment

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

showHumidity is a string due to current.njk implementing multiple options. I only ever implemented a binary True/False. Since js' Boolean("none") == True this will not work as intended without changes. (For that matter all strings that aren't empty are true, so it will always have to check against strings)

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I changed the if to check against "none", but other than that it is still undefined what the correct string should be to turn it on, since the current.njk Humidity has multiple placements, which is inapplicable here. Since the current config comment isn't listing possible values right now, i would suggest changing it to something along the lines of // current: "none", "wind", "below"; hourly: "none", "on". While this wouldn't be clean it would work.
Alternatively it could be split into "ShowHumidity: True/False" + "CurrentHumidityPosition: wind, below" etc; whatever is preferable. Changing the comment is a band aid but works, adding options could become convoluted but has less ambiguity.

@@ -21,15 +21,27 @@
{% endif %}
</td>
{% endif %}
{% if config.showHumidity %}
Copy link
Collaborator

Choose a reason for hiding this comment

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

besides that i had one question above...

@@ -11,6 +11,9 @@ _This release is scheduled to be released on 2024-10-01._

### Added

- [weather] Added option Humidity to hourly View
Copy link
Collaborator

Choose a reason for hiding this comment

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

you'll need to move your changelog entries into the latest develop section....

Copy link
Contributor Author

@OWL4C OWL4C Mar 20, 2025

Choose a reason for hiding this comment

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

Hopefully this worked? I replaced the entire file with the current one and then added back the changes
EDIT: nevermind.

OWL4C added a commit to OWL4C/MagicMirror that referenced this pull request Mar 20, 2025
…(Added Humidity to hourly. Fixed spacing for hourly UV. Added option to hide zeroes in hourly precipitation. Added config option documentation to defaults)
@OWL4C OWL4C closed this Mar 20, 2025
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.

4 participants