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

[IMP] hr_timesheet_sheet: dispay timesheets as time_float instead of float

Browse Source 
bzr revid: mat@openerp.com-20130524144145-gi69iru67hyk4emq
This commit is contained in:
Martin Trigaux
2013-05-24 16:41:45 +02:00
parent e528e410c2 fcff0fcbea
commit a65d35ef17
1 changed files with 35 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/hr_timesheet_sheet/static/src/js/timesheet.js
+35 -9
View File
@@ -163,24 +163,42 @@ openerp.hr_timesheet_sheet = function(instance) {
this.dfm = undefined;
}
},
is_valid_value:function(value){
var split_value = value.split(":");
var valid_value = true;
if (split_value.length > 2)
return false;
_.detect(split_value,function(num){
if(isNaN(num)){
valid_value = false;
}
});
return valid_value;
},
display_data: function() {
var self = this;
self.$el.html(QWeb.render("hr_timesheet_sheet.WeeklyTimesheet", {widget: self}));
_.each(self.accounts, function(account) {
_.each(_.range(account.days.length), function(day_count) {
if (!self.get('effective_readonly')) {
self.get_box(account, day_count).val(self.sum_box(account, day_count)).change(function() {
var num = Number($(this).val());
self.get_box(account, day_count).val(self.sum_box(account, day_count, true)).change(function() {
var num = $(this).val();
if (self.is_valid_value(num)){
num = (num == 0)?0:Number(self.parse_client(num));
}
if (isNaN(num)) {
$(this).val(self.sum_box(account, day_count));
$(this).val(self.sum_box(account, day_count, true));
} else {
account.days[day_count].lines[0].unit_amount += num - self.sum_box(account, day_count);
self.display_totals();
self.sync();
if(!isNaN($(this).val())){
$(this).val(self.sum_box(account, day_count, true));
}
}
});
} else {
self.get_box(account, day_count).html(self.sum_box(account, day_count));
self.get_box(account, day_count).html(self.sum_box(account, day_count, true));
}
});
});
@@ -247,12 +265,12 @@ openerp.hr_timesheet_sheet = function(instance) {
get_super_total: function() {
return this.$('.oe_timesheet_weekly_supertotal');
},
sum_box: function(account, day_count) {
sum_box: function(account, day_count, show_value_in_hour) {
var line_total = 0;
_.each(account.days[day_count].lines, function(line) {
line_total += line.unit_amount;
});
return line_total;
return (show_value_in_hour && line_total != 0)?this.format_client(line_total):line_total;
},
display_totals: function() {
var self = this;
@@ -266,12 +284,12 @@ openerp.hr_timesheet_sheet = function(instance) {
day_tots[day_count] += sum;
super_tot += sum;
});
self.get_total(account).html(acc_tot);
self.get_total(account).html(self.format_client(acc_tot));
});
_.each(_.range(self.dates.length), function(day_count) {
self.get_day_total(day_count).html(day_tots[day_count]);
self.get_day_total(day_count).html(self.format_client(day_tots[day_count]));
});
self.get_super_total().html(super_tot);
self.get_super_total().html(self.format_client(super_tot));
},
sync: function() {
var self = this;
@@ -279,6 +297,14 @@ openerp.hr_timesheet_sheet = function(instance) {
self.set({sheets: this.generate_o2m_value()});
self.setting = false;
},
//converts hour value to float
parse_client: function(value) {
return instance.web.parse_value(value, { type:"float_time" });
},
//converts float value to hour
format_client:function(value){
return instance.web.format_value(value, { type:"float_time" });
},
generate_o2m_value: function() {
var self = this;
var ops = [];