Commit 3a9c8d89 by Dennis Jen

Merge pull request #274 from edx/dsjen/display-table-hyphens

Replace zeros with hyphens in the performance pages.
parents cd261944 178031dc
...@@ -64,7 +64,8 @@ require(['vendor/domReady!', 'load/init-page'], function(doc, page) { ...@@ -64,7 +64,8 @@ require(['vendor/domReady!', 'load/init-page'], function(doc, page) {
model: courseModel, model: courseModel,
modelAttribute: 'answerDistribution', modelAttribute: 'answerDistribution',
columns: tableColumns, columns: tableColumns,
sorting: ['-count'] sorting: ['-count'],
replaceZero: '-'
}); });
}); });
......
...@@ -59,7 +59,8 @@ require(['vendor/domReady!', 'load/init-page'], function (doc, page) { ...@@ -59,7 +59,8 @@ require(['vendor/domReady!', 'load/init-page'], function (doc, page) {
model: model, model: model,
modelAttribute: 'problems', modelAttribute: 'problems',
columns: tableColumns, columns: tableColumns,
sorting: ['index'] sorting: ['index'],
replaceZero: '-'
}); });
}); });
}); });
...@@ -70,7 +70,8 @@ require(['vendor/domReady!', 'load/init-page'], function (doc, page) { ...@@ -70,7 +70,8 @@ require(['vendor/domReady!', 'load/init-page'], function (doc, page) {
model: model, model: model,
modelAttribute: 'assignments', modelAttribute: 'assignments',
columns: tableColumns, columns: tableColumns,
sorting: ['index'] sorting: ['index'],
replaceZero: '-'
}); });
}); });
}); });
...@@ -108,11 +108,15 @@ define(['models/course-model', 'views/data-table-view'], function(CourseModel, D ...@@ -108,11 +108,15 @@ define(['models/course-model', 'views/data-table-view'], function(CourseModel, D
view = new DataTableView({ view = new DataTableView({
el: document.createElement('div'), el: document.createElement('div'),
model: model, model: model,
modelAttribute: 'ages' modelAttribute: 'ages',
replaceZero: '-'
}), }),
func = view.createFormatNumberFunc(dataType), func = view.createFormatNumberFunc(dataType),
row = {}; row = {};
row[dataType] = 0;
expect(func(row, renderType)).toBe('-');
row[dataType] = 3; row[dataType] = 3;
expect(func(row, renderType)).toBe('3'); expect(func(row, renderType)).toBe('3');
......
...@@ -98,11 +98,14 @@ define(['dataTablesBootstrap', 'jquery', 'naturalSort', 'underscore', 'utils/uti ...@@ -98,11 +98,14 @@ define(['dataTablesBootstrap', 'jquery', 'naturalSort', 'underscore', 'utils/uti
* numbers. * numbers.
*/ */
createFormatNumberFunc: function (columnKey) { createFormatNumberFunc: function (columnKey) {
var self = this;
return function (row, type) { return function (row, type) {
var value = row[columnKey], var value = row[columnKey],
display = value; display = value;
if (type === 'display') { if (type === 'display') {
if (!_(value).isUndefined() && !_(value).isNull()){ if (_(self.options).has('replaceZero') && value === 0) {
display = self.options.replaceZero;
} else if (!_(value).isUndefined() && !_(value).isNull()){
display = Utils.localizeNumber(Number(value)); display = Utils.localizeNumber(Number(value));
} }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment