Merge lp:~laetitia-gangloff/acsone-addons/hr_utilization into lp:~acsone-openerp/acsone-addons/6.1

[Laetitia Gangloff (Acsone)]

hr_utilization: make it compatible with python 2.6

[Stéphane Bidoul (Acsone) (sbi)]

Laetitia,

I think the method double_list_to_dictionary makes things more difficult to understand. In my opinion, the loop creating the dictionary could be put in place in the code, as this does not create code duplication.

list_to_default_dictionary is fine, except the docstring should be more explicit, such as
''' create a dictionary with the elements of item_list as keys and default_value as value '''

-sbi

review: Needs Fixing (code review)

[lp:~laetitia-gangloff/acsone-addons/hr_utilization]

25. By lga on 2013-04-05

hr_utilization: remove double_list_to_dictionary, correct docstring of list_to_default_dictionary

[Laetitia Gangloff (Acsone) (laetitia-gangloff)]

As you suggest, I remove double_list_to_dictionary and set the for in the code.
And I replace the docstring of list_to_default_dictionary .

[Stéphane Bidoul (Acsone) (sbi)]

review: Approve

=== modified file 'hr_utilization/report/hr_utilization_report.py'
--- hr_utilization/report/hr_utilization_report.py	2013-02-01 10:26:05 +0000
+++ hr_utilization/report/hr_utilization_report.py	2013-04-05 15:20:32 +0000
@@ -104,6 +104,13 @@
             end = min(period_end,contract.date_end or period_end)
             hours += self.get_planned_working_hours(contract.working_hours, start, end)
         return hours
+    
+    def list_to_default_dictionary(self, default_value, item_list):
+        ''' create a dictionary with the elements of item_list as keys and default_value as value '''
+        res = {}
+        for item in item_list:
+            res[item] = default_value
+        return res
 
     def set_context(self, objects, data, ids, report_type = None):
         ''' Build variables to print in the report '''
@@ -176,7 +183,7 @@
                 res[key] = {
                     'name': user_name,
                     'company_id': company_id,
-                    'hours': {column_name:0.0 for column_name in column_names},
+                    'hours': self.list_to_default_dictionary(0.0, column_names),
                     'contracts': {}, # contract_id: contract
                 }
             if only_total:        
@@ -195,13 +202,13 @@
 
         res_total = {
             'name': TOTAL,
-            'hours': {column_name:0.0 for column_name in column_names},
+            'hours': self.list_to_default_dictionary(0.0, column_names),
         }
         if with_fte:
             res_total['fte'] = 0.0
         res_nc_total = {
             'name': TOTAL,
-            'hours': {column_name:0.0 for column_name in column_names},
+            'hours': self.list_to_default_dictionary(0.0, column_names),
         }
 
         # row total, percentages and fte for each row
@@ -217,7 +224,10 @@
                 # percentage
                 available_hours = self.get_total_planned_working_hours(data['period_start'], data['period_end'], u['contracts'].values())
                 total_available_hours += available_hours
-                u['pct'] = { column_name: hours/available_hours for column_name, hours in u['hours'].items() }
+                u['pct'] = {}
+                for column_name, hours in u['hours'].items():
+                    u['pct'][column_name] = hours/available_hours
+                
                 # fte
                 if with_fte:
                     company = company_obj.browse(self.cr, self.uid, [u['company_id']])[0]
@@ -237,9 +247,13 @@
 
         # total average percentage
         if total_available_hours:
-            res_total['pct'] = { column_name: hours/total_available_hours for column_name, hours in res_total['hours'].items() }
+            res_total['pct'] = {}
+            for column_name, hours in res_total['hours'].items():
+                res_total['pct'][column_name] = hours/total_available_hours
         else:
-            res_total['pct'] = { column_name: 0.0 for column_name, hours in res_total['hours'].items() }
+            res_total['pct'] = {}
+            for column_name, hours in res_total['hours'].items():
+                res_total['pct'][column_name] = 0.0
 
         # total fte
         if with_fte and fte_with_na and not(res_total['fte']):