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][IMP] scorecard: handling CF font style on chart #3099

Conversation

fw-bot
Copy link
Collaborator

@fw-bot fw-bot commented Oct 31, 2023

Description:

Before:
Any applied CF font color on key cell would not reflect on chart

After:
Text color of Key Value will reflect as follows:

  • If no font color is set, then default text color will be applied.
  • If CF font color is applied on cell, key value will reflect that text color.
  • If user sets a font color on cell, then user applied color of key value
    will take precedence over CF font color

"getStyleOfSingleCellChart" method of evaluation chart is modified to
"getBackgroundOfSingleCellChart", which handles style of a single cell
for chart at runtime .

Task: : 3543131

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 (_lt("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: #3029

@robodoo
Copy link
Collaborator

robodoo commented Oct 31, 2023

@fw-bot
Copy link
Collaborator Author

fw-bot commented Oct 31, 2023

@somu-odoo @LucasLefevre cherrypicking of pull request #3029 failed.

stdout:

Auto-merging src/helpers/figures/charts/gauge_chart.ts
Auto-merging src/helpers/figures/charts/scorecard_chart.ts
Auto-merging src/plugins/ui_core_views/evaluation_chart.ts
CONFLICT (content): Merge conflict in src/plugins/ui_core_views/evaluation_chart.ts
Auto-merging tests/components/scorecard_chart.test.ts

stderr:

14:34:02.641087 git.c:463               trace: built-in: git cherry-pick 11c1c1977d2ff469e5d8b43ec1a4f2c42b5697a8
error: could not apply 11c1c1977... [IMP] scorecard: handling CF font style on chart
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.

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

Before this commit:
Any applied CF font color on key cell would not reflect on chart

After this commit:
Text color of Key Value will reflect as follows:
- If no font color is set, then default text color will be applied.
- If CF font color is applied on cell, key value will reflect that text color.
- If user sets a font color on cell, then user applied color of key value
will take precedence over CF font color

"getStyleOfSingleCellChart" method of evaluation chart is modified to
"getBackgroundOfSingleCellChart", which handles style of a single cell
for chart at runtime .

Task - 3543131

X-original-commit: 37800cb
@somu-odoo somu-odoo force-pushed the saas-16.1-16.0-imp-cf-font-color-scorecard-somu-Rkh8-fw branch from 3c5bf3f to 689cd12 Compare November 2, 2023 05:29
@somu-odoo
Copy link
Contributor

@LucasLefevre resolved the conflict. Although should I create a PR for 17.0 or are we merging it in all versions of 16.0?

Copy link
Collaborator

@LucasLefevre LucasLefevre left a comment

Choose a reason for hiding this comment

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

Although should I create a PR for 17.0 or are we merging it in all versions of 16.0?

let's keep this fix/imp for this time.

robodoo r+

robodoo pushed a commit that referenced this pull request Nov 2, 2023
Before this commit:
Any applied CF font color on key cell would not reflect on chart

After this commit:
Text color of Key Value will reflect as follows:
- If no font color is set, then default text color will be applied.
- If CF font color is applied on cell, key value will reflect that text color.
- If user sets a font color on cell, then user applied color of key value
will take precedence over CF font color

"getStyleOfSingleCellChart" method of evaluation chart is modified to
"getBackgroundOfSingleCellChart", which handles style of a single cell
for chart at runtime .

Task - 3543131

closes #3099

X-original-commit: 37800cb
Signed-off-by: Lucas Lefèvre (lul) <lul@odoo.com>
@robodoo robodoo temporarily deployed to merge November 2, 2023 08:06 Inactive
@robodoo robodoo closed this Nov 2, 2023
@fw-bot fw-bot deleted the saas-16.1-16.0-imp-cf-font-color-scorecard-somu-Rkh8-fw branch November 16, 2023 08: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

4 participants