Skip to content

fix: rename 'Subtotal' to 'Subvalue' in pivot tables #37458

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
costajohnt wants to merge 1 commit into
base: master
Choose a base branch
from
Open

fix: rename 'Subtotal' to 'Subvalue' in pivot tables #37458

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
4 changes: 2 additions & 2 deletions superset-frontend/plugins/plugin-chart-pivot-table/src/react-pivottable/TableRenderers.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,7 +913,7 @@ export class TableRenderer extends Component<
true,
)}
>
{t('Subtotal')}
{t('Subvalue')}
</th>,
);
}
Expand Down Expand Up @@ -1136,7 +1136,7 @@ export class TableRenderer extends Component<
true,
)}
>
{t('Subtotal')}
{t('Subvalue')}
</th>
) : null;

Expand Down
4 changes: 2 additions & 2 deletions superset/charts/client_processing.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,7 @@ def pivot_df( # pylint: disable=too-many-locals, too-many-arguments, too-many-s
slice_ = df.columns.get_loc(subgroup)
subtotal = pivot_v2_aggfunc_map[aggfunc](df.iloc[:, slice_], axis=1)
depth = df.columns.nlevels - len(subgroup) - 1
total = metric_name if level == 0 else __("Subtotal")
total = metric_name if level == 0 else __("Subvalue")
subtotal_name = tuple([*subgroup, total, *([""] * depth)]) # noqa: C409
# insert column after subgroup
df.insert(int(slice_.stop), subtotal_name, subtotal)
Expand All @@ -201,7 +201,7 @@ def pivot_df( # pylint: disable=too-many-locals, too-many-arguments, too-many-s
df.iloc[slice_, :].apply(pd.to_numeric, errors="coerce"), axis=0
)
depth = groups.nlevels - len(subgroup) - 1
total = metric_name if level == 0 else __("Subtotal")
total = metric_name if level == 0 else __("Subvalue")
subtotal.name = tuple([*subgroup, total, *([""] * depth)]) # noqa: C409
# insert row after subgroup
df = pd.concat(
Expand Down
Loading