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

bunch of stuff to handle things

Browse Source 
bzr revid: nicolas.vanhoren@openerp.com-20120928163811-u1p5wabdfk5b3jqu
This commit is contained in:
niv-openerp
2012-09-28 18:38:11 +02:00
parent 8ed3be8a1b
commit ec78cf2ca5
1 changed files with 40 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/static/src/js/timesheet.js
+40 -6
View File
@@ -4,7 +4,6 @@ openerp.hr_timesheet_sheet = function(instance) {
var _t = instance.web._t;
instance.hr_timesheet_sheet.WeeklyTimesheet = instance.web.form.FormWidget.extend({
template: "hr_timesheet_sheet.WeeklyTimesheet",
init: function() {
this._super.apply(this, arguments);
this.set({
@@ -21,6 +20,7 @@ openerp.hr_timesheet_sheet = function(instance) {
});
this.on("change:sheets", this, this.update_sheets);
this.res_o2m_drop = new instance.web.DropMisordered();
this.description_line = _t("No description");
},
query_sheets: function() {
var self = this;
@@ -56,12 +56,46 @@ openerp.hr_timesheet_sheet = function(instance) {
// don't render anything until we have date_to and date_from
if (!self.get("date_to") || !self.get("date_from"))
return;
// calculating dates
self.dates = [];
var start = self.get("date_from");
var end = self.get("date_to");
while (start <= end) {
self.dates.push(start);
start = start.clone().addDays(1);
}
// group by account
var accounts = _.groupBy(this.get("sheets"), function(el) { return !!el.account_id ? el.account_id[0] : false });
// group by days
accounts = _.map(accounts, function(el) {
//var tmp = _.groupBy(el
});
self.accounts = _(this.get("sheets")).chain().map(function(el) {
// much simpler to use only the id in all cases
if (typeof(el.account_id) === "object")
el.account_id = el.account_id[0];
}).groupBy("account_id")
.map(function(lines, account_id) {
// group by days
account_id = account_id === "false" ? false : Number(account_id);
var index = _.groupBy(lines, "date");
var days = _.map(self.dates, function(date) {
var day = {day: date, lines: index[instance.web.date_to_str(date)] || []};
var to_add = _.find(day.lines, function(line) { return line.name === self.description_line });
if (to_add) {
day.lines = _.without(to_add);
day.lines.unshift(to_add);
} else {
day.lines.unshift({
name: self.description_line,
unit_amount: 0,
date: instance.web.date_to_str(date),
account_id: k === "false" ? false : Number(account_id),
});
}
});
return {account: account_id, days: days};
}).sortBy(function(account) {
return account.account;
}).value();
debugger;
//TODO: handle the account_id name_get problem !
},
});