Skip to content

Commit

Permalink
Merge pull request #50 from frappe/total-row
Browse files Browse the repository at this point in the history 
feat: 🎸 Total Row
  • Loading branch information
@netchampfaris
netchampfaris authored Nov 29, 2018
2 parents f791c91 + f5df997 commit 164979f
Show file tree
Hide file tree
Showing 6 changed files with 53 additions and 13 deletions.
2 changes: 1 addition & 1 deletion index.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,7 @@ <h1>Frappé DataTable</h1>
{ name: "Start Date", format: (value) => value.split('/').reverse().join('/') },
{ name: "Salary", format: value => formatMoney(value) }
];
data = [["Tiger Nixon", { content: "System Architect<br>New line", editable: false }, "Edinburgh", "5421", "2011/04/25", "320800"], ["Garrett Winters", "Accountant", "Tokyo", "8422", "2011/07/25", "170750"], ["Ashton Cox", "Junior Technical Author", "San Francisco", "1562", "2009/01/12", "86000"], ["Cedric Kelly", "Senior Javascript Developer", "Edinburgh", "6224", "2012/03/29", "433060"], ["Airi Satou", "Accountant", "Tokyo", "5407", "2008/11/28", "162700"], ["Brielle Williamson", "Integration Specialist", "New York", "4804", "2012/12/02", "372000"], ["Herrod Chandler", "Sales Assistant", "San Francisco", "9608", "2012/08/06", "137500"], ["Rhona Davidson", "Integration Specialist", "Tokyo", "6200", "2010/10/14", "327900"], ["Colleen Hurst", "Javascript Developer", "San Francisco", "2360", "2009/09/15", "205500"], ["Sonya Frost", "Software Engineer", "Edinburgh", "1667", "2008/12/13", "103600"], ["Jena Gaines", "Office Manager", "London", "3814", "2008/12/19", "90560"], ["Quinn Flynn", "Support Lead", "Edinburgh", "9497", "2013/03/03", "342000"], ["Charde Marshall", "Regional Director", "San Francisco", "6741", "2008/10/16", "470600"], ["Haley Kennedy", "Senior Marketing Designer", "London", "3597", "2012/12/18", "313500"], ["Tatyana Fitzpatrick", "Regional Director", "London", "1965", "2010/03/17", "385750"], ["Michael Silva", "Marketing Designer", "London", "1581", "2012/11/27", "198500"], ["Paul Byrd", "Chief Financial Officer (CFO)", "New York", "3059", "2010/06/09", "725000"], ["Gloria Little", "Systems Administrator", "New York", "1721", "2009/04/10", "237500"], ["Bradley Greer", "Software Engineer", "London", "2558", "2012/10/13", "132000"], ["Dai Rios", "Personnel Lead", "Edinburgh", "2290", "2012/09/26", "217500"], ["Jenette Caldwell", "Development Lead", "New York", "1937", "2011/09/03", "345000"], ["Yuri Berry", "Chief Marketing Officer (CMO)", "New York", "6154", "2009/06/25", "675000"], ["Caesar Vance", "Pre-Sales Support", "New York", "8330", "2011/12/12", "106450"], ["Doris Wilder", "Sales Assistant", "Sidney", "3023", "2010/09/20", "85600"], ["Angelica Ramos", "Chief Executive Officer (CEO)", "London", "5797", "2009/10/09", "1200,000"], ["Gavin Joyce", "Developer", "Edinburgh", "8822", "2010/12/22", "92575"], ["Jennifer Chang", "Regional Director", "Singapore", "9239", "2010/11/14", "357650"], ["Brenden Wagner", "Software Engineer", "San Francisco", "1314", "2011/06/07", "206850"], ["Fiona Green", "Chief Operating Officer (COO)", "San Francisco", "2947", "2010/03/11", "850000"], ["Shou Itou", "Regional Marketing", "Tokyo", "8899", "2011/08/14", "163000"], ["Michelle House", "Integration Specialist", "Sidney", "2769", "2011/06/02", "95400"], ["Suki Burks", "Developer", "London", "6832", "2009/10/22", "114500"], ["Prescott Bartlett", "Technical Author", "London", "3606", "2011/05/07", "145000"], ["Gavin Cortez", "Team Leader", "San Francisco", "2860", "2008/10/26", "235500"], ["Martena Mccray", "Post-Sales support", "Edinburgh", "8240", "2011/03/09", "324050"], ["Unity Butler", "Marketing Designer", "San Francisco", "5384", "2009/12/09", "85675"], ["Howard Hatfield", "Office Manager", "San Francisco", "7031", "2008/12/16", "164500"], ["Hope Fuentes", "Secretary", "San Francisco", "6318", "2010/02/12", "109850"], ["Vivian Harrell", "Financial Controller", "San Francisco", "9422", "2009/02/14", "452500"], ["Timothy Mooney", "Office Manager", "London", "7580", "2008/12/11", "136200"], ["Jackson Bradshaw", "Director", "New York", "1042", "2008/09/26", "645750"], ["Olivia Liang", "Support Engineer", "Singapore", "2120", "2011/02/03", "234500"], ["Bruno Nash", "Software Engineer", "London", "6222", "2011/05/03", "163500"], ["Sakura Yamamoto", "Support Engineer", "Tokyo", "9383", "2009/08/19", "139575"], ["Thor Walton", "Developer", "New York", "8327", "2013/08/11", "98540"], ["Finn Camacho", "Support Engineer", "San Francisco", "2927", "2009/07/07", "87500"], ["Serge Baldwin", "Data Coordinator", "Singapore", "8352", "2012/04/09", "138575"], ["Zenaida Frank", "Software Engineer", "New York", "7439", "2010/01/04", "125250"], ["Zorita Serrano", "Software Engineer", "San Francisco", "4389", "2012/06/01", "115000"], ["Jennifer Acosta", "Junior Javascript Developer", "Edinburgh", "3431", "2013/02/01", "75650"], ["Cara Stevens", "Sales Assistant", "New York", "3990", "2011/12/06", "145600"], ["Hermione Butler", "Regional Director", "London", "1016", "2011/03/21", "356250"], ["Lael Greer", "Systems Administrator", "London", "6733", "2009/02/27", "103500"], ["Jonas Alexander", "Developer", "San Francisco", "8196", "2010/07/14", "86500"], ["Shad Decker", "Regional Director", "Edinburgh", "6373", "2008/11/13", "183000"], ["Michael Bruce", "Javascript Developer", "Singapore", "5384", "2011/06/27", "183000"], ["Donna Snider", "Customer Support", "New York", "4226", "2011/01/25", "112000"]];
data = [["Tiger Nixon", { content: "System Architect<br>New line", editable: false }, "Edinburgh", 5421, "2011/04/25", 320800], ["Garrett Winters", "Accountant", "Tokyo", 8422, "2011/07/25", 170750], ["Ashton Cox", "Junior Technical Author", "San Francisco", 1562, "2009/01/12", 86000], ["Cedric Kelly", "Senior Javascript Developer", "Edinburgh", 6224, "2012/03/29", 433060], ["Airi Satou", "Accountant", "Tokyo", 5407, "2008/11/28", 162700], ["Brielle Williamson", "Integration Specialist", "New York", 4804, "2012/12/02", 372000], ["Herrod Chandler", "Sales Assistant", "San Francisco", 9608, "2012/08/06", 137500], ["Rhona Davidson", "Integration Specialist", "Tokyo", 6200, "2010/10/14", 327900], ["Colleen Hurst", "Javascript Developer", "San Francisco", 2360, "2009/09/15", 205500], ["Sonya Frost", "Software Engineer", "Edinburgh", 1667, "2008/12/13", 103600], ["Jena Gaines", "Office Manager", "London", 3814, "2008/12/19", 90560], ["Quinn Flynn", "Support Lead", "Edinburgh", 9497, "2013/03/03", 342000], ["Charde Marshall", "Regional Director", "San Francisco", 6741, "2008/10/16", 470600], ["Haley Kennedy", "Senior Marketing Designer", "London", 3597, "2012/12/18", 313500], ["Tatyana Fitzpatrick", "Regional Director", "London", 1965, "2010/03/17", 385750], ["Michael Silva", "Marketing Designer", "London", 1581, "2012/11/27", 198500], ["Paul Byrd", "Chief Financial Officer (CFO)", "New York", 3059, "2010/06/09", 725000], ["Gloria Little", "Systems Administrator", "New York", 1721, "2009/04/10", 237500], ["Bradley Greer", "Software Engineer", "London", 2558, "2012/10/13", 132000], ["Dai Rios", "Personnel Lead", "Edinburgh", 2290, "2012/09/26", 217500], ["Jenette Caldwell", "Development Lead", "New York", 1937, "2011/09/03", 345000], ["Yuri Berry", "Chief Marketing Officer (CMO)", "New York", 6154, "2009/06/25", 675000], ["Caesar Vance", "Pre-Sales Support", "New York", 8330, "2011/12/12", 106450], ["Doris Wilder", "Sales Assistant", "Sidney", 3023, "2010/09/20", 85600], ["Angelica Ramos", "Chief Executive Officer (CEO)", "London", 5797, "2009/10/09", "1200,000"], ["Gavin Joyce", "Developer", "Edinburgh", 8822, "2010/12/22", 92575], ["Jennifer Chang", "Regional Director", "Singapore", 9239, "2010/11/14", 357650], ["Brenden Wagner", "Software Engineer", "San Francisco", 1314, "2011/06/07", 206850], ["Fiona Green", "Chief Operating Officer (COO)", "San Francisco", 2947, "2010/03/11", 850000], ["Shou Itou", "Regional Marketing", "Tokyo", 8899, "2011/08/14", 163000], ["Michelle House", "Integration Specialist", "Sidney", 2769, "2011/06/02", 95400], ["Suki Burks", "Developer", "London", 6832, "2009/10/22", 114500], ["Prescott Bartlett", "Technical Author", "London", 3606, "2011/05/07", 145000], ["Gavin Cortez", "Team Leader", "San Francisco", 2860, "2008/10/26", 235500], ["Martena Mccray", "Post-Sales support", "Edinburgh", 8240, "2011/03/09", 324050], ["Unity Butler", "Marketing Designer", "San Francisco", 5384, "2009/12/09", 85675], ["Howard Hatfield", "Office Manager", "San Francisco", 7031, "2008/12/16", 164500], ["Hope Fuentes", "Secretary", "San Francisco", 6318, "2010/02/12", 109850], ["Vivian Harrell", "Financial Controller", "San Francisco", 9422, "2009/02/14", 452500], ["Timothy Mooney", "Office Manager", "London", 7580, "2008/12/11", 136200], ["Jackson Bradshaw", "Director", "New York", 1042, "2008/09/26", 645750], ["Olivia Liang", "Support Engineer", "Singapore", 2120, "2011/02/03", 234500], ["Bruno Nash", "Software Engineer", "London", 6222, "2011/05/03", 163500], ["Sakura Yamamoto", "Support Engineer", "Tokyo", 9383, "2009/08/19", 139575], ["Thor Walton", "Developer", "New York", 8327, "2013/08/11", 98540], ["Finn Camacho", "Support Engineer", "San Francisco", 2927, "2009/07/07", 87500], ["Serge Baldwin", "Data Coordinator", "Singapore", 8352, "2012/04/09", 138575], ["Zenaida Frank", "Software Engineer", "New York", 7439, "2010/01/04", 125250], ["Zorita Serrano", "Software Engineer", "San Francisco", 4389, "2012/06/01", 115000], ["Jennifer Acosta", "Junior Javascript Developer", "Edinburgh", 3431, "2013/02/01", 75650], ["Cara Stevens", "Sales Assistant", "New York", 3990, "2011/12/06", 145600], ["Hermione Butler", "Regional Director", "London", 1016, "2011/03/21", 356250], ["Lael Greer", "Systems Administrator", "London", 6733, "2009/02/27", 103500], ["Jonas Alexander", "Developer", "San Francisco", 8196, "2010/07/14", 86500], ["Shad Decker", "Regional Director", "Edinburgh", 6373, "2008/11/13", 183000], ["Michael Bruce", "Javascript Developer", "Singapore", 5384, "2011/06/27", 183000], ["Donna Snider", "Customer Support", "New York", 4226, "2011/01/25", 112000]];

if (largeData) {
for (let i = 0; i < 10; i++) {
Expand Down
44 changes: 39 additions & 5 deletions src/body-renderer.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ export default class BodyRenderer {
this.cellmanager = instance.cellmanager;
this.bodyScrollable = instance.bodyScrollable;
this.bodyDiv = $('.dt-body', this.bodyScrollable);
this.footer = this.instance.footer;
this.log = instance.log;
}

Expand All @@ -31,7 +32,9 @@ export default class BodyRenderer {
this.hyperlist.refresh(this.bodyDiv, config);
}

this.visibleRows = rows.map(row => row.meta.rowIndex);
this.visibleRows = rows;
this.visibleRowIndices = rows.map(row => row.meta.rowIndex);
this.renderFooter();
}

render() {
Expand All @@ -41,6 +44,41 @@ export default class BodyRenderer {
this.instance.setDimensions();
}

renderFooter() {
if (!this.options.showTotalRow) return;

const columns = this.datamanager.getColumns();
const totalRowTemplate = columns.map(col => {
let content = 0;
if (['_rowIndex', '_checkbox'].includes(col.id)) {
content = '';
}
return {
content,
isTotalRow: 1,
colIndex: col.colIndex,
column: col
};
});

const totalRow = this.visibleRows.reduce((acc, prevRow) => {
return acc.map((cell, i) => {
const prevCell = prevRow[i];
if (typeof prevCell.content === 'number') {
cell.content += prevRow[i].content;
}
if (!cell.format && prevCell.format) {
cell.format = prevCell.format;
}
return Object.assign({}, cell);
});
}, totalRowTemplate);

let html = this.rowmanager.getRowHTML(totalRow, { isTotalRow: 1, rowIndex: 'totalRow' });

this.footer.innerHTML = html;
}

restoreState() {
this.rowmanager.showAllRows();
this.rowmanager.highlightCheckedRows();
Expand All @@ -62,10 +100,6 @@ export default class BodyRenderer {
this.instance.toastMessage.innerHTML = '';
}

getDataForClusterize(rows) {
return rows.map(row => this.rowmanager.getRowHTML(row, row.meta));
}

getBodyHTML(rows) {
return `
<div class="dt-body">
Expand Down
8 changes: 5 additions & 3 deletions src/cellmanager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -727,18 +727,20 @@ export default class CellManager {
rowIndex,
colIndex,
isHeader,
isFilter
isFilter,
isTotalRow
} = cell;
const dataAttr = makeDataAttributeString({
rowIndex,
colIndex,
isHeader,
isFilter
isFilter,
isTotalRow
});

const row = this.datamanager.getRow(rowIndex);

const isBodyCell = !(isHeader || isFilter);
const isBodyCell = !(isHeader || isFilter || isTotalRow);

const className = [
'dt-cell',
Expand Down
3 changes: 3 additions & 0 deletions src/datatable.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -74,6 +74,8 @@ class DataTable {
<div class="dt-scrollable">
<div class="dt-body"></div>
</div>
<div class="dt-footer">
</div>
<div class="dt-freeze">
<span class="dt-freeze__message">
${this.options.freezeMessage}
Expand All @@ -86,6 +88,7 @@ class DataTable {

this.datatableWrapper = $('.datatable', this.wrapper);
this.header = $('.dt-header', this.wrapper);
this.footer = $('.dt-footer', this.wrapper);
this.bodyScrollable = $('.dt-scrollable', this.wrapper);
this.freezeContainer = $('.dt-freeze', this.wrapper);
this.toastMessage = $('.dt-toast', this.wrapper);
Expand Down
3 changes: 2 additions & 1 deletion src/defaults.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -58,5 +58,6 @@ export default {
treeView: false,
checkedRowStatus: true,
dynamicRowHeight: false,
pasteFromClipboard: false
pasteFromClipboard: false,
showTotalRow: false
};
6 changes: 3 additions & 3 deletions src/rowmanager.js
View file
Original file line number Diff line number Diff line change
Expand Up @@ -192,8 +192,8 @@ export default class RowManager {
row.meta.isTreeNodeClose = false;

const childrenToShow = this.datamanager.getImmediateChildren(rowIndex);
const visibleRows = this.bodyRenderer.visibleRows;
const rowsToShow = uniq([...childrenToShow, ...visibleRows]).sort(numberSortAsc);
const visibleRowIndices = this.bodyRenderer.visibleRowIndices;
const rowsToShow = uniq([...childrenToShow, ...visibleRowIndices]).sort(numberSortAsc);

this.showRows(rowsToShow);
}
Expand All @@ -203,7 +203,7 @@ export default class RowManager {
row.meta.isTreeNodeClose = true;

const rowsToHide = this.datamanager.getChildren(rowIndex);
const visibleRows = this.bodyRenderer.visibleRows;
const visibleRows = this.bodyRenderer.visibleRowIndices;
const rowsToShow = visibleRows
.filter(rowIndex => !rowsToHide.includes(rowIndex))
.sort(numberSortAsc);
Expand Down

0 comments on commit 164979f

Please sign in to comment.