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

FEMS Backports 2025-01-20 #2976

Merged
merged 8 commits into from
Jan 20, 2025
Merged

FEMS Backports 2025-01-20 #2976

merged 8 commits into from
Jan 20, 2025

Conversation

sfeilmeier
Copy link
Contributor

@sfeilmeier sfeilmeier commented Jan 20, 2025

  • UI

    • use user language instead of browser lang for locale
      • replace locale being overwritten with browserlang to be using the user lang
      • fix czech locale, cz throwing errors for
      • piping (using angular pipes)
      • formatting of numbers
      • replacing it with cs -> Ref
    • Improve Modbus Widget
      • fixes name of channel in ModbusTCP widget (e.g. Ess1SetActivePowerEquals was shown as SetActivePowerEquals/706 in OM)
      • Several ess lead to repeating register names in ModbusTcp widget.
    • Dark mode pick-date improvements
      • Enhancing styles of popover in accordance with dark-mode feature.
    • Add handling for Controller.IO.Heating.Room
  • Edge

    • Code Cleanup for Java 21
      • Migrate Switch-Case-Expressions to Switch-Case-Statements
      • General code cleanup (using Eclipse "Clean up" tool)
    • EVCS Mennekes: cleanup
    • Cleanup Eclipse warning (General: Clean up Warnings in Code #2971)

Co-authored-by: Anas Shetla 141644226+AnasShetla@users.noreply.github.com
Co-authored-by: Lukas Rieger 73471197+lukasrgr@users.noreply.github.com
Co-authored-by: Fabian Brandtner 10850256+fabian94533@users.noreply.github.com
Co-authored-by: Michael Grill 59126309+michaelgrill@users.noreply.github.com
Co-authored-by: Sebastian Asen 47855186+sebastianasen@users.noreply.github.com
Co-authored-by: Christian Lehne 51822163+clehne@users.noreply.github.com
Co-authored-by: Stefan Feilmeier 3515268+sfeilmeier@users.noreply.github.com
Co-authored-by: Thomas Sicking 91258335+tsicking@users.noreply.github.com

sfeilmeier and others added 5 commits January 20, 2025 22:26
-  replace locale being overwritten with browserlang to be using the user lang
- fix czech locale, `cz` throwing errors for
   - piping (using angular pipes)
   - formatting of numbers

replacing it with `cs` -> [Ref](https://github.com/angular/common-builds/blob/main/locales/global/cs.js)
<hr/>

Co-authored-by: Anas Shetla <141644226+AnasShetla@users.noreply.github.com>
Reviewed-by: Anas Shetla <141644226+AnasShetla@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Co-committed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
- fixes name of channel in ModbusTCP widget (e.g. Ess1SetActivePowerEquals was shown as SetActivePowerEquals/706 in OM)
- Several ess lead to repeating register names in ModbusTcp widget.

Reviewed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Fabian Brandtner <10850256+fabian94533@users.noreply.github.com>
Co-committed-by: Fabian Brandtner <10850256+fabian94533@users.noreply.github.com>
Enhancing styles of popover in accordance with dark-mode feature.

Reviewed-by: Lukas Rieger <73471197+lukasrgr@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Anas Shetla <141644226+AnasShetla@users.noreply.github.com>
Co-committed-by: Anas Shetla <141644226+AnasShetla@users.noreply.github.com>
- Migrate Switch-Case-Expressions to Switch-Case-Statements
- UI: Fix FactoryId `Controller.IO.Heating.Room`
- General code cleanup (using Eclipse "Clean up" tool)

Co-authored-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Reviewed-by: Michael Grill <59126309+michaelgrill@users.noreply.github.com>
Remove invalid code

Co-authored-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Co-authored-by: Christian Lehne <51822163+clehne@users.noreply.github.com>
Co-authored-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Reviewed-by: Christian Lehne <51822163+clehne@users.noreply.github.com>
Reviewed-by: Sebastian Asen <47855186+sebastianasen@users.noreply.github.com>
Reviewed-by: Stefan Feilmeier <3515268+sfeilmeier@users.noreply.github.com>
Co-authored-by: Thomas Sicking <91258335+tsicking@users.noreply.github.com>
Co-committed-by: Thomas Sicking <91258335+tsicking@users.noreply.github.com>
Copy link

codecov bot commented Jan 20, 2025

Codecov Report

Attention: Patch coverage is 41.91876% with 672 lines in your changes missing coverage. Please review.

Additional details and impacted files
@@              Coverage Diff              @@
##             develop    #2976      +/-   ##
=============================================
+ Coverage      56.85%   57.03%   +0.19%     
- Complexity      9800     9810      +10     
=============================================
  Files           2281     2279       -2     
  Lines          97624    97389     -235     
  Branches        7208     7055     -153     
=============================================
+ Hits           55491    55537      +46     
+ Misses         40047    39809     -238     
+ Partials        2086     2043      -43     

@sfeilmeier sfeilmeier merged commit 878f7e7 into develop Jan 20, 2025
5 of 7 checks passed
@sfeilmeier sfeilmeier deleted the feature/fems-backports branch January 20, 2025 22:15
sfeilmeier added a commit that referenced this pull request Jan 22, 2025
Fix java.lang.VerifyError: Inconsistent stackmap frames at branch target 273 that appeared after #2976.

I don't know why, but this fixes the problem.

Closes #2984
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.

None yet

1 participant