Merge lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr into lp:openobject-addons

[Meera Trambadia (OpenERP)]

hr_attendance:removed conflicting demo data" --fixes lp:791087
Note:-The demo data which has been removed was added for the bug-751411, but its removal doesn't affect the fixes of bug-751411

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

review: Approve

[Olivier Dony (Odoo) (odo-openerp)]

Hello,

I don't think removing the demo data records is the good solution, as it is interesting to have entries in the daily attendances when you install a new demo database.

Couldn't we instead replace the XML demo data with a YML demo file that does a smarter job: create 8 hours of attendance for every day of the current business week, using proper timedelta calculations, and making no conflict?

We could also do the same for the analytic entries, to have a match between them.

Thanks!

(I'm resetting the bug to Confirmed, as I don't think this is a proper fix)

review: Disapprove

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello,

I have replaced the xml demo data file with yml demo file which creates 8 hours of attendance for every day of the current business week.

Thanks,
mtr

review: Needs Resubmitting

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Working as expected but need to improve few things,

=== renamed file 'hr_attendance/hr_attendance_demo.xml' => 'hr_attendance/hr_attendance_demo.xml.THIS' .. What is this changed for ?

Improve time of your days of week.. make it compatible with all the days

Improve the starting string of yaml

Thanks,
mra

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4772. By mtr <mtr@mtr> on 2011-07-12

[FIX] hr_attendance:-replaced yml demo file in place of xml file for attendance demo data

4773. By mtr <mtr@mtr> on 2011-07-12

[MERGE] branch merged with main-addons

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have made the changes as specified above.

Thanks,
mtr

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4774. By mtr <mtr@mtr> on 2011-07-12

[IMP] hr_attendance: improved path given for demo file

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Changes are ok as per comment,but now when i try to uninstall the module it gives error:

except_orm: ('ValidateError', u'Error occurred while validating the field(s) action: Error: Sign in (resp. Sign out) must follow Sign out (resp. Sign in)')

can you check and please fix it ?

Thanks,
mra

review: Needs Fixing

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4775. By mtr <mtr@mtr> on 2011-07-14

[IMP] hr_attendance: improved code in yml demo to successfully install/uninstall the module

[Meera Trambadia (OpenERP) (mtr-openerp)]

Hello sir,

I have improved code in yaml to fix the error.

Thanks,
mtr

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4776. By Ujjvala Collins on 2011-07-15

[IMP] hr_attendance: Improved demo yml to make it more dynamic with dates.

[Ujjvala Collins (uco-openerp)]

Hello,

I have changed the demo yml file to make it more dynamic in creating records. It will also update the records if needed.

Thanks,
Ujjvala

review: Needs Resubmitting

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4777. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Improved demo yml.

4778. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Refactored demo yml with code optimization.

4779. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Small improvement.

4780. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Code optimiztion.

[Mustufa Rangwala (Open ERP) (mra-tinyerp)]

Now using yaml demo file, attendances create for current business week.

review: Approve

[lp:~openerp-dev/openobject-addons/trunk-bug-791087-mtr]

4781. By Meera Trambadia (OpenERP) on 2011-09-15

[MERGE] branch merged with openobject-addons

[Fabien (Open ERP) (fp-tinyerp)]

the implementation code is ugly.

Unmerged revisions

4781. By Meera Trambadia (OpenERP) on 2011-09-15

[MERGE] branch merged with openobject-addons

4780. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Code optimiztion.

4779. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Small improvement.

4778. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Refactored demo yml with code optimization.

4777. By Ujjvala Collins on 2011-07-18

[IMP] hr_attendance: Improved demo yml.

4776. By Ujjvala Collins on 2011-07-15

[IMP] hr_attendance: Improved demo yml to make it more dynamic with dates.

4775. By mtr <mtr@mtr> on 2011-07-14

[IMP] hr_attendance: improved code in yml demo to successfully install/uninstall the module

4774. By mtr <mtr@mtr> on 2011-07-12

[IMP] hr_attendance: improved path given for demo file

4773. By mtr <mtr@mtr> on 2011-07-12

[MERGE] branch merged with main-addons

4772. By mtr <mtr@mtr> on 2011-07-12

[FIX] hr_attendance:-replaced yml demo file in place of xml file for attendance demo data

=== modified file 'hr_attendance/__openerp__.py'
--- hr_attendance/__openerp__.py	2011-07-06 12:29:28 +0000
+++ hr_attendance/__openerp__.py	2011-09-15 11:57:57 +0000
@@ -46,7 +46,7 @@
         'wizard/hr_attendance_error_view.xml',
         'wizard/hr_attendance_sign_in_out_view.xml',
     ],
-    'demo_xml': ['hr_attendance_demo.xml'],
+    'demo_xml': ['hr_attendance_demo.yml'],
     'test': ['test/test_hr_attendance.yml',
              'test/hr_attendance_report.yml'
     ],

=== removed file 'hr_attendance/hr_attendance_demo.xml'
--- hr_attendance/hr_attendance_demo.xml	2011-07-07 12:25:42 +0000
+++ hr_attendance/hr_attendance_demo.xml	1970-01-01 00:00:00 +0000
@@ -1,142 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<openerp>
-    <data noupdate="True">
-
-        <record id="attendance1" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-01 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance2" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-01 11:51')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance3" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-02 12:47')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance4" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-02 19:53')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance5" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-03 07:32')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance6" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-03 12:32')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance7" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-04 14:01')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance8" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-04 17:21')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance9" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-05 09:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance10" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-05 12:42')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance11" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-06 13:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance12" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-06 18:34')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance13" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-07 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance14" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-07 18:21')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance15" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-08 08:21')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance16" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-08 12:54')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance17" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-09 13:32')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance18" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-09 19:31')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance19" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-10 07:10')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-
-        <record id="attendance20" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-10 12:34')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-        
-<!-- FIXME! Commented out to enable installation without creating conflicts
-     during the first days of a month. To be properly fixed, see
-     launchpad bug 791087!
-
-        <record id="attendance21" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-%d 10:00')" name="name"/>
-            <field name="action">sign_in</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
-        
-        <record id="attendance22" model="hr.attendance">
-            <field eval="time.strftime('%Y-%m-%d 18:00')" name="name"/>
-            <field name="action">sign_out</field>
-            <field name="employee_id" ref="hr.employee1"/>
-        </record>
--->
-    </data>
-</openerp>

=== added file 'hr_attendance/hr_attendance_demo.yml'
--- hr_attendance/hr_attendance_demo.yml	1970-01-01 00:00:00 +0000
+++ hr_attendance/hr_attendance_demo.yml	2011-09-15 11:57:57 +0000
@@ -0,0 +1,131 @@
+-
+  Creating demo data for attendance for current week consisting of five working days.
+-
+  !python {model: hr.attendance}: |
+    import time
+    from datetime import datetime, date
+    from datetime import timedelta
+    current_date = date(datetime.today().year, datetime.today().month, datetime.today().day)
+    day_of_week = ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday','Saturday', 'Sunday']
+    current_day = day_of_week[date.weekday(current_date)]
+    days = {'Monday': 1, 'Tuesday': 2, 'Wednesday': 3, 'Thursday': 4, 'Friday': 5}
+    loop = days[current_day]
+    employee_id = ref('hr.employee1')
+    names_in = [(current_date - timedelta(i)).strftime('%Y-%m-%d 10:00:00') for i in range(loop)]
+    names_out = [(current_date - timedelta(i)).strftime('%Y-%m-%d 19:00:00') for i in range(loop)]
+    attendance_ids = self.search(cr, uid, ['|',('name', 'in', names_in), ('name', 'in', names_out), ('employee_id','=',employee_id)])
+    names = []
+    if attendance_ids:
+        names = self.read(cr, uid, attendance_ids, ['id','name'], context=context)
+
+    def check_data(data, names=names):
+        if data['name'] in [i['name'] for i in names]:
+            return [i['id'] for i in names if data['name']==i['name']]
+
+    if current_day in ['Monday', 'Tuesday', 'Wednesday', 'Thursday', 'Friday']:
+        sign_in = {
+            'name': (current_date).strftime('%Y-%m-%d 10:00:00'),
+            'action': 'sign_in',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_in)
+        if ids:
+            self.write(cr, uid, ids, sign_in, context=context)
+        else:
+            self.create(cr, uid, sign_in, context=context)
+        sign_out = {
+            'name': (current_date).strftime('%Y-%m-%d 19:00:00'),
+            'action': 'sign_out',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_out)
+        if ids:
+            self.write(cr, uid, ids, sign_out, context=context)
+        else:
+            self.create(cr, uid, sign_out, context=context)
+    if current_day in ['Tuesday', 'Wednesday', 'Thursday', 'Friday']:
+        sign_in = {
+            'name': (current_date - timedelta(1)).strftime('%Y-%m-%d 10:00:00'),
+            'action': 'sign_in',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_in)
+        if ids:
+            self.write(cr, uid, ids, sign_in, context=context)
+        else:
+            self.create(cr, uid, sign_in, context=context)
+        sign_out = {
+            'name': (current_date - timedelta(1)).strftime('%Y-%m-%d 19:00:00'),
+            'action': 'sign_out',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_out)
+        if ids:
+            self.write(cr, uid, ids, sign_out, context=context)
+        else:
+            self.create(cr, uid, sign_out, context=context)
+    if current_day in ['Wednesday', 'Thursday', 'Friday']:
+        sign_in = {
+            'name': (current_date - timedelta(2)).strftime('%Y-%m-%d 10:00:00'),
+            'action': 'sign_in',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_in)
+        if ids:
+            self.write(cr, uid, ids, sign_in, context=context)
+        else:
+            self.create(cr, uid, sign_in, context=context)
+        sign_out = {
+            'name': (current_date - timedelta(2)).strftime('%Y-%m-%d 19:00:00'),
+            'action': 'sign_out',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_out)
+        if ids:
+            self.write(cr, uid, ids, sign_out, context=context)
+        else:
+            self.create(cr, uid, sign_out, context=context)
+    if current_day in ['Thursday', 'Friday']:
+        sign_in = {
+            'name': (current_date - timedelta(3)).strftime('%Y-%m-%d 10:00:00'),
+            'action': 'sign_in',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_in)
+        if ids:
+            self.write(cr, uid, ids, sign_in, context=context)
+        else:
+            self.create(cr, uid, sign_in, context=context)
+        sign_out = {
+            'name': (current_date - timedelta(3)).strftime('%Y-%m-%d 19:00:00'),
+            'action': 'sign_out',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_out)
+        if ids:
+            self.write(cr, uid, ids, sign_out, context=context)
+        else:
+            self.create(cr, uid, sign_out, context=context)
+    if current_day == 'Friday':
+        sign_in = {
+            'name': (current_date - timedelta(4)).strftime('%Y-%m-%d 10:00:00'),
+            'action': 'sign_in',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_in)
+        if ids:
+            self.write(cr, uid, ids, sign_in, context=context)
+        else:
+            self.create(cr, uid, sign_in, context=context)
+        sign_out = {
+            'name': (current_date - timedelta(4)).strftime('%Y-%m-%d 19:00:00'),
+            'action': 'sign_out',
+            'employee_id': employee_id
+        }
+        ids = check_data(sign_out)
+        if ids:
+            self.write(cr, uid, ids, sign_out, context=context)
+        else:
+            self.create(cr, uid, sign_out, context=context)
+  
+