Merge lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-bracket into lp:~hr-core-editors/hr-timesheet/7.0

[Lorenzo Battistini]

[FIX] wrong opening bracket due to PEP8 restyle:
    http://bazaar.launchpad.net/~hr-core-editors/hr-timesheet/7.0/revision/40.2.21

    [ADD] button_dummy to force recomputing attendace (on attendance form and company form)

[Pedro Manuel Baeza (pedro.baeza)]

Hi, Lorenzo, don't you think it's better to use store triggers to recompute needed data?

Regards.

review: Needs Information (code review)

[Lorenzo Battistini (elbati)]

Hello Pedro,
what do you mean by store triggers?
I'm triggering recomputing because 'action' is in the store dictionary:
'hr.attendance': (_get_attendances, ['name', 'action', 'employee_id'], 20),

[lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-bracket]

69. By Lorenzo Battistini on 2014-05-29

[ADD] 'Update all the attendance data' button on company

[Pedro Manuel Baeza (pedro.baeza)]

Hi, I mean that you can put on the field definition a keyword argument called store, with some trigger methods that recompute automatically the field. You can see an example here:

http://bazaar.launchpad.net/~account-payment-team/account-payment/7.0/view/head:/account_payment_extension/account_move_line.py#L200

Regards.

[lp:~agilebg/hr-timesheet/fix-hr_attendance_analysis-bracket]

70. By Lorenzo Battistini on 2014-06-03

[FIX] comment

[Lorenzo Battistini (elbati)]

Ah, sure. It is so already.
See
http://bazaar.launchpad.net/~agilebg/hr-timesheet/fix-hr_attendance_analysis-bracket/view/69/hr_attendance_analysis/hr_attendance.py#L401

By writing the 'action' field without changing it, I'm forcing the '_get_attendance_duration' to be executed.
I'm doing this in order to allow the user to recompute values by clicking buttons on the interface, without changing the record (I don't know another way).

This is useful when the computation went wrong for some error and you want to explicit recompute the function fields without changing the data which the field depends on.

I improved the comment

[Pedro Manuel Baeza (pedro.baeza)]

Thanks for the changes, Lorenzo.

Regards.

review: Approve (code review)

[Pedro Manuel Baeza (pedro.baeza)]

This project is now hosted on https://github.com/OCA/hr-timesheet. Please move your proposal there. This guide may help you https://github.com/OCA/maintainers-tools/wiki/How-to-move-a-Merge-Proposal-to-GitHub

review: Needs Resubmitting

[Alex Comba - Agile BG (tafaru)]

Moved to https://github.com/OCA/hr-timesheet/pull/7
I prefer do not delete the proposal to keep all the associated comments that have been made.

review: Disapprove

Unmerged revisions

70. By Lorenzo Battistini on 2014-06-03

[FIX] comment

69. By Lorenzo Battistini on 2014-05-29

[ADD] 'Update all the attendance data' button on company

68. By Lorenzo Battistini on 2014-05-28

[FIX] wrong opening bracket due to PEP8 restyle:
http://bazaar.launchpad.net/~hr-core-editors/hr-timesheet/7.0/revision/40.2.21

[ADD] button_dummy to force recomputing attendace

=== modified file 'hr_attendance_analysis/company_view.xml'
--- hr_attendance_analysis/company_view.xml	2013-03-08 13:40:53 +0000
+++ hr_attendance_analysis/company_view.xml	2014-06-03 06:21:00 +0000
@@ -9,6 +9,10 @@
                 <page string="Configuration" position="inside">
                     <group name="attendance_analysis_grp" string="Attendance analysis">
                         <field name="working_time_precision" widget="float_time"/>
+                        <button name="update_attendance_data" type="object"
+                            string="Update all the attendance data"
+                            confirm="This will update all the attendance data and may take a while"
+                        />
                     </group>
                 </page>
             </field>

=== modified file 'hr_attendance_analysis/hr_attendance.py'
--- hr_attendance_analysis/hr_attendance.py	2014-05-21 22:04:08 +0000
+++ hr_attendance_analysis/hr_attendance.py	2014-06-03 06:21:00 +0000
@@ -42,6 +42,12 @@
         'working_time_precision': 1.0 / 60 # hours
         }
 
+    def update_attendance_data(self, cr, uid, ids, context=None):
+        attendance_pool = self.pool.get('hr.attendance')
+        att_ids = attendance_pool.search(cr, uid, [], context=context)
+        attendance_pool.button_dummy(cr, uid, att_ids, context=context)
+        return True
+
 
 class hr_attendance(orm.Model):
 
@@ -298,7 +304,7 @@
                                     attendance_start.hour + attendance_start.minute / 60.0
                                     + attendance_start.second / 60.0 / 60.0
                                     )
-                                if attendance_start_hour >= (
+                                if (attendance_start_hour >=
                                     calendar_attendance.hour_from and
                                     (attendance_start_hour - (calendar_attendance.hour_from +
                                     calendar_attendance.tolerance_to)) < 0.01
@@ -315,7 +321,7 @@
                                     + attendance_stop.second / 60.0 / 60.0
                                     )
                                 calendar_attendance = attendance_pool.browse(cr, uid, matched_schedule_ids[0], context=context)
-                                if attendance_stop_hour <= (
+                                if (attendance_stop_hour <=
                                     calendar_attendance.hour_to and
                                     (attendance_stop_hour - (calendar_attendance.hour_to -
                                     calendar_attendance.tolerance_from)) > -0.01
@@ -414,4 +420,9 @@
             store=_store_rules),
     }
 
-
+    def button_dummy(self, cr, uid, ids, context=None):
+        for att in self.browse(cr, uid, ids, context=context):
+            #  By writing the 'action' field without changing it,
+            #  I'm forcing the '_get_attendance_duration' to be executed
+            att.write({'action': att.action})
+        return True

=== modified file 'hr_attendance_analysis/hr_attendance_view.xml'
--- hr_attendance_analysis/hr_attendance_view.xml	2013-03-05 11:28:38 +0000
+++ hr_attendance_analysis/hr_attendance_view.xml	2014-06-03 06:21:00 +0000
@@ -11,6 +11,7 @@
                     <field name="duration"   widget="float_time"/>
                     <field name="outside_calendar_duration"   widget="float_time"/>
                     <field name="inside_calendar_duration"  widget="float_time" />
+                    <button name="button_dummy" string="Update attendance analysis" type="object"/>
                 </field>
             </field>
         </record>