Skip to content

Add support to sort key_z_to_a #1303

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

Open
xorti wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Add support to sort key_z_to_a #1303

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
44 changes: 36 additions & 8 deletions dist/pivot.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion dist/pivot.js.map
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/pivot.min.js
View file
Open in desktop

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion dist/pivot.min.js.map
View file
Open in desktop

Large diffs are not rendered by default.

19 changes: 14 additions & 5 deletions src/pivot.coffee
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -200,6 +200,10 @@ callWithJQuery ($) ->
totals: "Totals" #for table renderer
vs: "vs" #for gchart renderer
by: "by" #for gchart renderer
key_a_to_z: "Key A to Z"
key_z_to_a: "Key Z to A"
value_a_to_z: "Value A to Z"
value_z_to_a: "Value Z to A"

#dateFormat deriver l10n requires month and day names to be passed in directly
mthNamesEn = ["Jan","Feb","Mar","Apr","May","Jun","Jul","Aug","Sep","Oct","Nov","Dec"]
Expand Down Expand Up @@ -377,10 +381,12 @@ callWithJQuery ($) ->
switch @rowOrder
when "value_a_to_z" then @rowKeys.sort (a,b) => naturalSort v(a,[]), v(b,[])
when "value_z_to_a" then @rowKeys.sort (a,b) => -naturalSort v(a,[]), v(b,[])
when "key_z_to_a" then @rowKeys.sort (a,b) => -naturalSort a, b
else @rowKeys.sort @arrSort(@rowAttrs)
switch @colOrder
when "value_a_to_z" then @colKeys.sort (a,b) => naturalSort v([],a), v([],b)
when "value_z_to_a" then @colKeys.sort (a,b) => -naturalSort v([],a), v([],b)
when "key_z_to_a" then @colKeys.sort (a,b) => -naturalSort a, b
else @colKeys.sort @arrSort(@colAttrs)

getColKeys: () =>
Expand Down Expand Up @@ -868,22 +874,25 @@ callWithJQuery ($) ->
aggregator.append $("<option>").val(x).html(x)

ordering =
key_a_to_z: {rowSymbol: "&varr;", colSymbol: "&harr;", next: "value_a_to_z"}
value_a_to_z: {rowSymbol: "&darr;", colSymbol: "&rarr;", next: "value_z_to_a"}
value_z_to_a: {rowSymbol: "&uarr;", colSymbol: "&larr;", next: "key_a_to_z"}
key_a_to_z: {rowSymbol: "&DownArrowBar;", colSymbol: "&rarrb;", next: "key_z_to_a", title: opts.localeStrings.key_a_to_z}
key_z_to_a: {rowSymbol: "&UpArrowBar;", colSymbol: "&larrb;", next: "value_a_to_z", title: opts.localeStrings.key_z_to_a}
value_a_to_z: {rowSymbol: "&darr;", colSymbol: "&rarr;", next: "value_z_to_a", title: opts.localeStrings.value_a_to_z}
value_z_to_a: {rowSymbol: "&uarr;", colSymbol: "&larr;", next: "key_a_to_z", title: opts.localeStrings.value_z_to_a}

rowOrderArrow = $("<a>", role: "button").addClass("pvtRowOrder")
.data("order", opts.rowOrder).html(ordering[opts.rowOrder].rowSymbol)
.data("order", opts.rowOrder).attr('title', ordering[opts.rowOrder].title).html(ordering[opts.rowOrder].rowSymbol)
.bind "click", ->
$(this).data("order", ordering[$(this).data("order")].next)
$(this).html(ordering[$(this).data("order")].rowSymbol)
$(this).attr('title', ordering[$(this).data("order")].title)
refresh()

colOrderArrow = $("<a>", role: "button").addClass("pvtColOrder")
.data("order", opts.colOrder).html(ordering[opts.colOrder].colSymbol)
.data("order", opts.colOrder).attr('title', ordering[opts.colOrder].title).html(ordering[opts.colOrder].colSymbol)
.bind "click", ->
$(this).data("order", ordering[$(this).data("order")].next)
$(this).html(ordering[$(this).data("order")].colSymbol)
$(this).attr('title', ordering[$(this).data("order")].title)
refresh()

$("<td>").addClass('pvtVals pvtUiCell')
Expand Down