Skip to content

Export group columns #24

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
RexBarker wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Export group columns #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6063ffa
Prevent failure on some start-up cases, when 'index_columns' are not …
Mar 8, 2023
f886921
Allow export of grouped column definitions to ('groups') _grid_data_up
Mar 8, 2023
0595319
Also trap errors when getting unavailable columns; reduce some logging
Mar 8, 2023
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
50 changes: 36 additions & 14 deletions ipyaggrid/grid.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,13 +227,14 @@ def export(self, change):
if(len(data_up['index_rows']['names']) != 0):
to_df['index'] = pd.MultiIndex.from_tuples(
*[data_up['index_rows']['values']], names=data_up['index_rows']['names'])
if len(data_up['index_columns'][0]) == 1:
index_columns = [elem[0]
for elem in data_up['index_columns']]
to_df['columns'] = index_columns
else:
to_df['columns'] = pd.MultiIndex.from_tuples(
*[data_up['index_columns']])
if data_up['index_columns']:
if len(data_up['index_columns'][0]) == 1:
index_columns = [elem[0]
for elem in data_up['index_columns']]
to_df['columns'] = index_columns
else:
to_df['columns'] = pd.MultiIndex.from_tuples(
*[data_up['index_columns']])
to_df['data'] = data_up['data']
if self.export_to_df:
self.grid_data_out['range'] = pd.DataFrame(**to_df)
Expand All @@ -246,19 +247,40 @@ def export(self, change):
if(len(data_up['index_rows']['names']) != 0):
to_df['index'] = pd.MultiIndex.from_tuples(
*[data_up['index_rows']['values']], names=data_up['index_rows']['names'])
if len(data_up['index_columns'][0]) == 1:
index_columns = [elem[0]
for elem in data_up['index_columns']]
to_df['columns'] = index_columns
else:
to_df['columns'] = pd.MultiIndex.from_tuples(
*[data_up['index_columns']])
if data_up['index_columns']:
if len(data_up['index_columns'][0]) == 1:
index_columns = [elem[0]
for elem in data_up['index_columns']]
to_df['columns'] = index_columns
else:
to_df['columns'] = pd.MultiIndex.from_tuples(
*[data_up['index_columns']])
to_df['data'] = data_up['data']
if self.export_to_df:
self.grid_data_out['cols'] = pd.DataFrame(**to_df)
else:
self.grid_data_out['cols'] = pd.DataFrame(
**to_df).to_dict(orient='records')
if ('groups' in self._grid_data_up.keys()):
data_up = self._grid_data_up['groups']
to_df = {}
if(len(data_up['index_rows']['names']) != 0):
to_df['index'] = pd.MultiIndex.from_tuples(
*[data_up['index_rows']['values']], names=data_up['index_rows']['names'])
if data_up['index_columns']:
if len(data_up['index_columns'][0]) == 1:
index_columns = [elem[0]
for elem in data_up['index_columns']]
to_df['columns'] = index_columns
else:
to_df['columns'] = pd.MultiIndex.from_tuples(
*[data_up['index_columns']])
to_df['data'] = data_up['data']
if self.export_to_df:
self.grid_data_out['groups'] = pd.DataFrame(**to_df)
else:
self.grid_data_out['groups'] = pd.DataFrame(
**to_df).to_dict(orient='records')
x = 0
if 'counter' in self.grid_data_out:
x = self.grid_data_out['counter']
Expand Down
9 changes: 9 additions & 0 deletions js/src/widget_builder.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -140,6 +140,7 @@ const buildAgGrid = (view, gridData, gridOptions_str, div, sheet, dropdownMulti
gridOptions.api.updateRowData({ remove: rows });
if (view.model.get('sync_grid')) {
exportFunc.exportGrid(gridOptions, view);
exportFunc.exportGroupColumns(gridOptions, view);
}
}
if (view.model.get('_export_mode') === 'rows') {
Expand All @@ -148,6 +149,7 @@ const buildAgGrid = (view, gridData, gridOptions_str, div, sheet, dropdownMulti
}
if (view.model.get('_export_mode') === 'grid') {
exportFunc.exportGrid(gridOptions, view);
exportFunc.exportGroupColumns(gridOptions, view);
}
if (view.model.get('_export_mode') === 'columns') {
if (gridOptions.enableRangeSelection) exportFunc.exportColumns(gridOptions, view);
Expand All @@ -161,6 +163,12 @@ const buildAgGrid = (view, gridData, gridOptions_str, div, sheet, dropdownMulti
// console.log(params);
exportFunc.exportGrid(gridOptions, view);
});
gridOptions.api.addEventListener('columnRowGroupChanged', params => {
exportFunc.exportGroupColumns(gridOptions, view);
});
gridOptions.api.addEventListener('rowGroupOpened', params => { // forces sync of state
exportFunc.exportGroupColumns(gridOptions, view);
});
}

// listen to _grid_data_down
Expand All @@ -179,6 +187,7 @@ const buildAgGrid = (view, gridData, gridOptions_str, div, sheet, dropdownMulti
exportFunc.exportRangeData(gridOptions, view);
exportFunc.exportColumns(gridOptions, view);
exportFunc.exportRowsOfRange(gridOptions, view);
exportFunc.exportGroupColumns(gridOptions, view);
// }
});
}
Expand Down
51 changes: 38 additions & 13 deletions js/src/widget_export.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,20 +9,16 @@ const exportFunc = {};
*/
exportFunc.exportRangeData = (options, view) => {
let rangeSelection;
let cols;
try {
console.log(options.api.getCellRanges())
//console.log(options.api.getCellRanges())
rangeSelection = options.api.getCellRanges();
rangeSelection = rangeSelection[0];
cols = findCorrectColumns(rangeSelection.columns, options);
} catch (e) {
console.log('No cells selected.');
return;
}

console.log(rangeSelection)
console.log(rangeSelection[0].startRow)
console.log(rangeSelection[0].endRow)
rangeSelection = rangeSelection[0];
console.log(rangeSelection)
const cols = findCorrectColumns(rangeSelection.columns, options);
const rows = [];

const id1 = rangeSelection.startRow.rowIndex;
Expand Down Expand Up @@ -52,7 +48,7 @@ exportFunc.exportRangeData = (options, view) => {
index_columns: res.columns,
},
};
console.log(toUp);
//console.log(toUp);
view.model.set('_grid_data_up', toUp);
view.touch();
};
Expand Down Expand Up @@ -87,7 +83,7 @@ const exportRowsFunc = (options, view, rows) => {
index_columns: res.columns,
},
};
console.log(toUp);
//console.log(toUp);
view.model.set('_grid_data_up', toUp);
view.touch();
};
Expand Down Expand Up @@ -149,13 +145,14 @@ function getCol(col, options) {

exportFunc.exportColumns = (options, view) => {
let rangeSelection;
let cols;
try {
rangeSelection = options.api.getCellRanges()[0];
cols = findCorrectColumns(rangeSelection.columns, options);
} catch (e) {
console.log('No cells selected.');
return;
}
const cols = findCorrectColumns(rangeSelection.columns, options);
const rows = [];

options.api.forEachNodeAfterFilterAndSort(node => rows.push(node));
Expand All @@ -181,7 +178,35 @@ exportFunc.exportColumns = (options, view) => {
index_columns: res.columns,
},
};
console.log(toUp);
//console.log(toUp);
view.model.set('_grid_data_up', toUp);
view.touch();
};
// Export current group columns
exportFunc.exportGroupColumns = (options, view) => {
const columns = [['Group']];
const names = ['Index'];
const data = [];
const values = [];
let i = 0;
options.columnApi.getRowGroupColumns().forEach(col => {
data.push(col.colId);
values.push([i++]);
});
const res = {
names,
values,
data,
columns,
};
const toUp = {
groups: {
data: res.data,
index_rows: { names: res.names, values: res.values },
index_columns: res.columns,
},
};
//console.log(toUp);
view.model.set('_grid_data_up', toUp);
view.touch();
};
Expand Down Expand Up @@ -227,7 +252,7 @@ exportFunc.exportGrid = function(options, view, level = 0) {
index_columns: res.columns,
},
};
console.log(toUp);
//console.log(toUp);
view.model.set('_grid_data_up', toUp);
view.touch();
};
Expand Down