pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[IMP] web: _mockReadGroup method support week and year

Browse Source 
Before this commit _mockReadGroup method support only day and month aggregate
function and return invalid domain for date type field.

With this commit _mockReadGroup method support week and year aggregate function.
And return correct domain having start date and end date if date type field.
This commit is contained in:
Jigar Patel
2018-05-29 15:22:22 +02:00
committed by Géry Debongnie
parent 4e5f826ce5
commit ecbafe92d2
1 changed files with 27 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/web/static/tests/helpers/mock_server.js
+27 -7
View File
@@ -737,6 +737,10 @@ var MockServer = Class.extend({
return false;
} else if (aggregateFunction === 'day') {
return moment(val).format('YYYY-MM-DD');
} else if (aggregateFunction === 'week') {
return moment(val).format('ww YYYY');
} else if (aggregateFunction === 'year') {
return moment(val).format('Y');
} else {
return moment(val).format('MMMM YYYY');
}
@@ -750,12 +754,7 @@ var MockServer = Class.extend({
value = (value ? value + ',' : value) + groupByField + '#';
var fieldName = groupByField.split(':')[0];
if (fields[fieldName].type === 'date') {
var aggregateFunction = groupByField.split(':')[1] || 'month';
if (aggregateFunction === 'day') {
value += moment(record[fieldName]).format('YYYY-MM-DD');
} else {
value += moment(record[fieldName]).format('MMMM YYYY');
}
value += formatValue(groupByField, record[fieldName]);
} else {
value += record[groupByField];
}
@@ -790,7 +789,28 @@ var MockServer = Class.extend({
} else {
res[groupByField] = val;
}
res.__domain = [[fieldName, "=", val]].concat(res.__domain);
if (field.type === 'date') {
var aggregateFunction = groupByField.split(':')[1];
var startDate, endDate;
if (aggregateFunction === 'day') {
startDate = moment(val, 'YYYY-MM-DD');
endDate = startDate.clone().add(1, 'days');
} else if (aggregateFunction === 'week') {
startDate = moment(val, 'ww YYYY');
endDate = startDate.clone().add(1, 'weeks');
} else if (aggregateFunction === 'year') {
startDate = moment(val, 'Y');
endDate = startDate.clone().add(1, 'years');
} else {
startDate = moment(val, 'MMMM YYYY');
endDate = startDate.clone().add(1, 'months');
}
res.__domain = [[fieldName, '>=', startDate.format('YYYY-MM-DD')], [fieldName, '<', endDate.format('YYYY-MM-DD')]].concat(res.__domain);
} else {
res.__domain = [[fieldName, '=', val]].concat(res.__domain);
}
});
// compute count key to match dumb server logic...