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

[FW][FIX] charts: time axis broken with long formatted date #4153

Closed

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Apr 29, 2024

Description

In the charts, we truncate the labels if they are too long (>20 characters)[1]. But in line chart with time axis, chartJS parses the labels to get a date. This parsing obviously fails if the label is truncated.

This commit fixes the issue by not truncating the labels if the axis is a time axis.

[1] e.g. a format like "12/04/2024 12:34:56 AM".

Task: : 3857242

review checklist

  • feature is organized in plugin, or UI components
  • support of duplicate sheet (deep copy)
  • in model/core: ranges are Range object, and can be adapted (adaptRanges)
  • in model/UI: ranges are strings (to show the user)
  • undo-able commands (uses this.history.update)
  • multiuser-able commands (has inverse commands and transformations where needed)
  • new/updated/removed commands are documented
  • exportable in excel
  • translations (_t("qmsdf %s", abc))
  • unit tested
  • clean commented code
  • track breaking changes
  • doc is rebuild (npm run doc)
  • status is correct in Odoo

Forward-Port-Of: #4148
Forward-Port-Of: #4058

@robodoo
Copy link
Collaborator

robodoo commented Apr 29, 2024

@fw-bot
Copy link
Collaborator Author

fw-bot commented Apr 29, 2024

@hokolomopo @rrahir cherrypicking of pull request #4058 failed.

stdout:

Auto-merging src/helpers/figures/charts/chart_ui_common.ts
Auto-merging tests/figures/chart/chart_plugin.test.ts
CONFLICT (content): Merge conflict in tests/figures/chart/chart_plugin.test.ts

stderr:

13:10:54.091744 git.c:463               trace: built-in: git cherry-pick 5be294289f029c1151f782d39f80a5703b8f08a3
error: could not apply 5be294289... [FIX] charts: time axis broken with long formatted date
hint: After resolving the conflicts, mark them with
hint: "git add/rm <pathspec>", then run
hint: "git cherry-pick --continue".
hint: You can instead skip this commit with "git cherry-pick --skip".
hint: To abort and get back to the state before "git cherry-pick",
hint: run "git cherry-pick --abort".
----------
status:

Either perform the forward-port manually (and push to this branch, proceeding as usual) or close this PR (maybe?).

In the former case, you may want to edit this PR message as well.

⚠️ after resolving this conflict, you will need to merge it via @robodoo.

More info at https://github.com/odoo/odoo/wiki/Mergebot#forward-port

In the charts, we truncate the labels if they are too long
(>20 characters)[1]. But in line chart with time axis, chartJS parses
the labels to get a date. This parsing obviously fails if the label
is truncated.

This commit fixes the issue by not truncating the labels if the
axis is a time axis.

[1] e.g. a format like "12/04/2024 12:34:56 AM".

Task: 3857242
X-original-commit: 0ff6dfc
@hokolomopo hokolomopo force-pushed the master-16.0-datetime-line-chart-broken-adrm-45TF-fw branch from 2cfaeda to 9a1c6ca Compare April 29, 2024 12:28
@hokolomopo
Copy link
Contributor

@robodoo r+

robodoo pushed a commit that referenced this pull request Apr 29, 2024
In the charts, we truncate the labels if they are too long
(>20 characters)[1]. But in line chart with time axis, chartJS parses
the labels to get a date. This parsing obviously fails if the label
is truncated.

This commit fixes the issue by not truncating the labels if the
axis is a time axis.

[1] e.g. a format like "12/04/2024 12:34:56 AM".

closes #4153

Task: 3857242
X-original-commit: 0ff6dfc
Signed-off-by: Rémi Rahir (rar) <rar@odoo.com>
Signed-off-by: Adrien Minne (adrm) <adrm@odoo.com>
@robodoo robodoo added the 17.3 label Apr 29, 2024
@robodoo robodoo closed this Apr 29, 2024
@fw-bot fw-bot deleted the master-16.0-datetime-line-chart-broken-adrm-45TF-fw branch May 13, 2024 13:46
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

3 participants