audrius/app-odoo
1
0
Fork 0
mirror of https://github.com/guohuadeng/app-odoo.git synced 2025-02-23 04:11:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

处理pivot时区

Browse Source 
todo:report类型的时间特殊
This commit is contained in:
ivan deng
2017-11-16 04:00:21 +08:00
parent a4a981f93b
commit ee90161267
2 changed files with 34 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app_search_range/static/src/js/pivot.js
View File

@@ -188,31 +188,49 @@ PivotView.include({
} }
} }
// if (value) {
// value_tmp = parseInt(value);
// if (value_tmp != 0) {
// domain.push([field,'=',value_tmp]);
// } else {
// domain.push([field,'!=', false]);
// }
// }
}); });
// 注意，date和datetime型的处理是不同的，已处理完
if (self.$search_button) { if (self.$search_button) {
var start_date = self.$search_button.find('.app_start_date').val(), var start_date = self.$search_button.find('.app_start_date').val(),
end_date = self.$search_button.find('.app_end_date').val(), end_date = self.$search_button.find('.app_end_date').val(),
field = self.$search_button.find('.app_select_field').val(); field = self.$search_button.find('.app_select_field').val(),
field_type = 'datetime';
var tz = session.user_context.tz,
start_utc,
end_utc;
_.each(self.columns, function (value, key, list) {
if (value.name == field) {
field_type = value.type;
return false;
}
});
moment.locale(tz);
var l10n = _t.database.parameters; var l10n = _t.database.parameters;
if (start_date) { if (start_date) {
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); if (field_type = 'date') {
domain.push([field, '>=', start_date]); //日期类型，无须utc处理
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', start_date]);
} else {
//日期时间，处理utc
start_date = moment(moment(start_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
start_utc = moment(start_date)
domain.push([field, '<=', start_utc]);
}
} }
if (end_date) { if (end_date) {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD'); if (field_type = 'date') {
domain.push([field, '<=', end_date]); end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD');
domain.push([field, '>=', end_date]);
} else {
end_date = moment(moment(end_date, time.strftime_to_moment_format(l10n.date_format))).format('YYYY-MM-DD 00:00:00');
end_utc = moment(end_date)
domain.push([field, '<=', end_utc]);
}
} }
} }
if (self.$search_range) { if (self.$search_range) {

10
app_search_range/static/src/js/tree.js
View File

@@ -204,16 +204,8 @@ ListView.include({
} }
} }
// if (value) {
// value_tmp = parseInt(value);
// if (value_tmp != 0) {
// domain.push([field,'=',value_tmp]);
// } else {
// domain.push([field,'!=', false]);
// }
// }
}); });
// todo: 注意，date和datetime型的处理是不同的，已处理完datetime类型，还有date类型 // 注意，date和datetime型的处理是不同的，已处理完
if (self.$search_button) { if (self.$search_button) {
var start_date = self.$search_button.find('.app_start_date').val(), var start_date = self.$search_button.find('.app_start_date').val(),
end_date = self.$search_button.find('.app_end_date').val(), end_date = self.$search_button.find('.app_end_date').val(),