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.

Sign up for GitHub

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

Jump to bottom

Pie doughnut dataset weight #5951

Merged
merged 21 commits into from Feb 27, 2019
Merged

Pie doughnut dataset weight #5951

merged 21 commits into from Feb 27, 2019

Commits on Jan 2, 2019

  1. Added functionality to give pie & doughnut datasets a weight attribute. 

    Weight affects the relative thickness of the dataset when there are
multiple datasets in pie & doughnut charts.
The default weight of each dataset is 1. Providing any other numerical
value will allow the pie or doughnut dataset to be drawn with a
thickness relative to its default size. For example a weight of 2 will
allow the dataset to be drawn double its typical dataset thickness.
NOTE: The weight attribute will only have an affect on a pie or
doughnut chart if there is more than one visible dataset. Using
weight on a pie or doughnut dataset when there is only one dataset
on the chart will have no affect.
    @Vincent-Ip
    Vincent-Ip committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    dc8a10f View commit details
    Browse the repository at this point in the history

  2. Updated the doughnut documentation

    @Vincent-Ip
    Vincent-Ip committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    1c2f11e View commit details
    Browse the repository at this point in the history

  3. trying to reduce the Cognitive Complexity of getRingWeightOffset

    @Vincent-Ip
    Vincent-Ip committed Jan 2, 2019
    Configuration menu
    Copy the full SHA
    a977196 View commit details
    Browse the repository at this point in the history

Commits on Jan 3, 2019

  1. Updated the description for the weight attribute to make it simpler.

    @Vincent-Ip
    Vincent-Ip committed Jan 3, 2019
    Configuration menu
    Copy the full SHA
    f351884 View commit details
    Browse the repository at this point in the history

Commits on Jan 4, 2019

  1. made changes as suggested by benmccann. 

      - added back getRingIndex function to doughnut controller.
  - moved getVisibleDatasetTotalWeight from the base controller file to
    the doughnut controller.
  - removed parentheses from the chartWeight assignment statement.

  - Also, slightly renamed the new functions
    @Vincent-Ip
    Vincent-Ip committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    eeb3f10 View commit details
    Browse the repository at this point in the history

  2. refactored the getVisibleDatasetTotalWeight function

    @Vincent-Ip
    Vincent-Ip committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    83afbc6 View commit details
    Browse the repository at this point in the history

  3. made the new doughnut methods private and made suggested code 

    simplicfications.
    @Vincent-Ip
    Vincent-Ip committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    66767c3 View commit details
    Browse the repository at this point in the history

  4. simplified chartWeight assignment

    @Vincent-Ip
    Vincent-Ip committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    e442a73 View commit details
    Browse the repository at this point in the history

  5. more simplifications for chartWeight assignment

    @Vincent-Ip
    Vincent-Ip committed Jan 4, 2019
    Configuration menu
    Copy the full SHA
    5647b78 View commit details
    Browse the repository at this point in the history

Commits on Jan 9, 2019

  1. Changed new property name from weight to flex

    @Vincent-Ip
    Vincent-Ip committed Jan 9, 2019
    Configuration menu
    Copy the full SHA
    aab7d6c View commit details
    Browse the repository at this point in the history

Commits on Jan 10, 2019

  1. Merge branch 'master' into pie-doughnut-dataset-weight

    @Vincent-Ip
    Vincent-Ip committed Jan 10, 2019
    Configuration menu
    Copy the full SHA
    3fa2243 View commit details
    Browse the repository at this point in the history

Commits on Jan 14, 2019

  1. changed the new feature name from flex to weight.

    @Vincent-Ip
    Vincent-Ip committed Jan 14, 2019
    Configuration menu
    Copy the full SHA
    ccb5bd4 View commit details
    Browse the repository at this point in the history

Commits on Jan 18, 2019

  1. update to allow a weight of 0, treat negative weights as 0, and 

    prevent div/0 err when a 0 is returned by _getVisibleDatasetWeightTotal
    @Vincent-Ip
    Vincent-Ip committed Jan 18, 2019
    Configuration menu
    Copy the full SHA
    78aacf2 View commit details
    Browse the repository at this point in the history

Commits on Jan 29, 2019

  1. added valueOrDefault function to new methods in doughnut controller

    @Vincent-Ip
    Vincent-Ip committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    9b03ca4 View commit details
    Browse the repository at this point in the history

  2. Merge branch 'master' into pie-doughnut-dataset-weight

    @Vincent-Ip
    Vincent-Ip committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    0d28307 View commit details
    Browse the repository at this point in the history

  3. Added test for new ring weight functions

    @Vincent-Ip
    Vincent-Ip committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    919206f View commit details
    Browse the repository at this point in the history

  4. Merged changes form ChartJs repository into my local git branch pie-d… 

    …oughnut-dataset-weight
    @Vincent-Ip
    Vincent-Ip committed Jan 29, 2019
    Configuration menu
    Copy the full SHA
    6affa67 View commit details
    Browse the repository at this point in the history

Commits on Feb 22, 2019

  1. Added image tests for pie / doughnut weight feature

    @Vincent-Ip
    Vincent-Ip committed Feb 22, 2019
    Configuration menu
    Copy the full SHA
    8dd7034 View commit details
    Browse the repository at this point in the history

Commits on Feb 23, 2019

  1. updated weight description in documentation

    @Vincent-Ip
    Vincent-Ip committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    2ca836e View commit details
    Browse the repository at this point in the history

  2. removed unnecessary parens from new controller.doughnut.js code

    @Vincent-Ip
    Vincent-Ip committed Feb 23, 2019
    Configuration menu
    Copy the full SHA
    94bbb9b View commit details
    Browse the repository at this point in the history

Commits on Feb 27, 2019

  1. removed pixel based testing for doughnut weight

    @Vincent-Ip
    Vincent-Ip committed Feb 27, 2019
    Configuration menu
    Copy the full SHA
    619f667 View commit details
    Browse the repository at this point in the history