Merge lp:~openerp-groupes/hrself-addons/clean-onchange-leave-request into lp:hrself-addons

[tfr (Openerp)]

Unmerged revisions

624. By tfr (Openerp) on 2011-11-25

[CLEAN] refactor onchanges and constraints in leave request form view for details
See : http://pad.openerp.com/groupes-spec

=== modified file 'hrself_holidays/hrself_holidays.py'
--- hrself_holidays/hrself_holidays.py	2011-11-25 10:02:29 +0000
+++ hrself_holidays/hrself_holidays.py	2011-11-25 16:57:23 +0000
@@ -721,12 +721,19 @@
             if not self._disable_checks(cr, uid, leave_request.type_id.id, activity_context_id) and not (leave_request.duration > 0):
                 return False
         return True
+    
+    def _check_am_pm(self, cr, uid, ids, context=None):
+        for leave in self.browse(cr, uid, ids, context=context):
+            if leave.date_to != leave.date_from and leave.am_pm != AM_PM_ALL_DAY:
+                return False
+        return True
 
     _constraints = [
         (_check_duration, _('Duration must be greater than 0 !'), ['duration']),
-        (_check_mandatory_reason, _('Type of holiday requires a reason'), ['reason']),
+        (_check_am_pm, _('The leave last more then one day, you should select all day'), ['am_pm']),
         (_check_limit_date, _check_limit_date_message, ['date_to']),
         (_check_minimum_date, _check_minimum_date_message, ['date_from']),
+        (_check_mandatory_reason, _('Type of holiday requires a reason'), ['reason']),
         (_check_type_activity_context, _('This type is not compatible with activity context of employee'), ['type']),
     ]
 
@@ -752,7 +759,7 @@
             old_date_to = hrself_datetime.to_date(leave.date_to)
             new_date_to = _to_date(values.get('date_to'), old_date_to)
             if (new_date_from != old_date_from) or (new_date_to != old_date_to):
-                on_change = self._onchange_date_type(cr, uid, [leave.id], leave.employee_id.id, new_date_from, new_date_to, leave.type_id.id, leave.am_pm, context)
+                on_change = self.onchange_date_type(cr, uid, [leave.id], leave.employee_id.id, new_date_from, new_date_to, leave.type_id.id, leave.am_pm, context)
                 warning = on_change.get('warning')
                 if warning:
                     logger.warning(warning['message'])
@@ -764,106 +771,58 @@
                 write_ids.append(leave.id)
         return super(hrself_holidays_request_leave, self).write(cr, uid, write_ids, values, context=context)
     
-    def onchange_employee_id(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes employee_id."""
-        return self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_date_from(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes date_from."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_date_to(self, cr, uid, ids, employee_id, date_to, date_from, type_id, am_pm, context):
+    def onchange_date(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context=None):
         """Action to execute when the user changes date_to."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def onchange_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes the type."""
-        return self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
+        print 'on_change_date'
+        if not date_from or not date_to:
+            print "return empty" 
+            return {}
+        
+        if date_from > date_to:
+            message = _('The start date (%s) must be smaller or equal to the end date (%s)!') % (date_from, date_to)
+            return {'warning' : {'title': _('Invalid dates'), 'message': message}}
+        print 'onchange type finaly'
+        return self.onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
 
     def _disable_checks(self, cr, uid, type_id, activity_context_id):
         """Disable checks?"""
-        result = False
-        if type_id and activity_context_id:
-            precision_id = self.pool.get('hrself.holidays.type').browse(cr, uid, type_id).precision_id_for_context(activity_context_id)
-            if precision_id:
-                prestation_code = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).prestation_code_id
-                if prestation_code and prestation_code.gross_leave:
-                    result = True
-        return result
-
-    def onchange_duration(self, cr, uid, ids, employee_id, date_from, date_to, type_id, duration, unit, am_pm, context=None):
-        """Action to execute when the user changes the duration."""
-        result = {}
-        if employee_id and date_from and date_to:
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-            if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
-                allowed_duration = self._duration(cr, uid, type_id, am_pm, activities)['value']['duration']
-                if unit == hrself.TIME_UNIT_HOUR and date_from == date_to:
-                    if duration > allowed_duration:
-                        result['warning'] = {
-                            'title': _('Warning'), 
-                            'message': _('The leave request duration is greater than allowed. \n You have %d %s(s) left.') % 
-                            (allowed_duration, hrself.TIME_UNITS_DICT[unit])
-                        }
-                        result['value'] = {'duration': allowed_duration}
-                elif duration <> allowed_duration:
-                    result['warning'] = {'title': _('Warning'), 'message': _('You cannot change the duration.')}
-                    result['value'] = {'duration': allowed_duration}
-        return result
-
-    def onchange_unit(self, cr, uid, ids, employee_id, date_from, date_to, type_id, unit, am_pm, context=None):
-        """Action to execute when the user changes the unit."""
-        result = {}
-        date_from = date_from or fields.date.today()
-        date_to = date_to or fields.date.today()
-        if employee_id:
-            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-            allowed_unit = self._duration(cr, uid, type_id, am_pm, activities)['value']['unit']
-            if unit <> allowed_unit:
-                result['warning'] = {'title': _('Warning'), 'message': _('You cannot change the unit.')}
-                result['value'] = {'unit': allowed_unit}
-        return result
-
-    def _onchange_dates_am_pm(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes dates (from or to) or the AM PM indicator."""
-        result = {}
-        if am_pm != AM_PM_ALL_DAY and date_from != date_to:
-            am_pm = AM_PM_ALL_DAY
-            result['warning'] = {'title': _('Warning'), 'message': _('You cannot set AM or PM when start date is not equal to end date.')}
-        result.update(self._onchange_date_type(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context))
-        result['value']['am_pm'] = am_pm
-        return result
-
-    def onchange_am_pm(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
-        """Action to execute when the user changes the AM PM indicator."""
-        return self._onchange_dates_am_pm(cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context)
-
-    def _onchange_date_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context):
+        if not type_id or not activity_context_id:
+            return False
+            
+        precision_id = self.pool.get('hrself.holidays.type').browse(cr, uid, type_id).precision_id_for_context(activity_context_id)
+        if precision_id:
+            prestation_code = self.pool.get('hrself.holidays.type.precision').browse(cr, uid, precision_id).prestation_code_id
+            if prestation_code and prestation_code.gross_leave:
+                result = True
+                
+        return False
+
+    def onchange_date_type(self, cr, uid, ids, employee_id, date_from, date_to, type_id, am_pm, context=None):
         """Action to execute when the user changes a date (from or to) or the type."""
+        print "on change type", employee_id, date_from, date_to, type_id, am_pm
+        
         result = {}
         activities = None
-        if date_from and date_to:
-            if date_from > date_to:
-                message = _('The start date (%s) must be smaller or equal to the end date (%s)!') % (date_from, date_to)
+        if not (date_from and date_to and type_id and employee_id):
+            return result
+        
+        
+        services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+        activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
+        if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
+            present = False
+            absence_days =  set()
+            for activity in activities:
+                if activity['presence_absence'] == 'A':
+                    date = hrself_datetime.to_string(hrself_datetime.to_date(activity['date']))
+                    absence_days.add(date)
+                elif activity['presence_absence'] == 'P':
+                    present = True
+            if not present:
+                message = _('You cannot take leave on absence days: ') + ', '.join(absence_days) 
                 result['warning'] = {'title': _('Invalid dates'), 'message': message}
-            elif employee_id and type_id:
-                services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-                activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
-                if not self._disable_checks(cr, uid, type_id, activities and activities[0] and activities[0]['activity_context']):
-                    presence_days = []
-                    absence_days = []
-                    for activity in activities:
-                        date = hrself_datetime.to_string(hrself_datetime.to_date(activity['date']))
-                        if activity['presence_absence'] == 'A' and date not in absence_days:
-                            absence_days.append(date)
-                        elif activity['presence_absence'] == 'P' and date not in presence_days:
-                            presence_days.append(date)
-                    if not presence_days:
-                        message = _('You cannot take leave on absence days: ') + ', '.join(absence_days) 
-                        result['warning'] = {'title': _('Invalid dates'), 'message': message}
-                result.update(self._duration(cr, uid, type_id, am_pm, activities))
+        
+        result.update(self._duration(cr, uid, type_id, am_pm, activities))
         return result
 
     def _duration(self, cr, uid, type_id, am_pm, activities):
@@ -893,7 +852,7 @@
                     duration = duration_in_hour
             else:
                 type = self.pool.get('hrself.holidays.type').browse (cr, uid, type_id)
-                message = _('No precision defined for the holidays type named %s identified by %d') % (type.name , type.id)
+                message = _('No precision defined for the holidays type named %s identified by %d, please contact your administrator') % (type.name , type.id)
                 result['warning'] = {'title': _('No precision'), 'message': message}
         result['value'] = {
             'duration': duration, 
@@ -943,16 +902,21 @@
             return None 
 
     def _check_allowed_duration(self, cr, uid, ids, context=None):
-        """Check that the leave request duration is not greater than allowed.
-        For the moment, only takes into account leaves 
-        where date from is equal to date to.
-        :return: (allowed duration, unit)
-        :rtype: (int, str)"""
+        """
+            Check that the leave request duration is not greater than allowed.
+            For the moment, only takes into account leaves 
+            where date from is equal to date to.
+            :return: (allowed duration, unit)
+            :rtype: (int, str)
+        """
         for leave in self.browse(cr, uid, ids, context=context):
             date_from = leave.date_from
             date_to = leave.date_to
+            employee_id = leave.employee_id.id
+            services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
+            activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
             if date_from == date_to:
-                employee_id = leave.employee_id.id
+                
                 search_ids = self.search(cr, uid, [
                     ('employee_id', '=', employee_id),
                     '|', ('state', '=', STATE_APPROVED), ('state', '=', STATE_CONFIRMED),
@@ -972,12 +936,17 @@
                                 already_taken += search_leave.duration
                             else:
                                 already_taken += search_leave.duration_in_hour
-                services = self.pool.get('hrself.services').hrself_holidays_service(cr, uid, context=context)
-                activities = services.get_theoretical_activities(cr, uid, employee_id, date_from, date_to, context=context)
+                
                 max_duration = self._duration(cr, uid, leave.type_id.id, AM_PM_ALL_DAY, activities)['value']['duration_in_hour']
                 allowed_duration = max(round(max_duration - already_taken, 2), 0.0)
                 if leave.duration > allowed_duration:
                     return (allowed_duration, hrself.TIME_UNIT_HOUR_LABEL)
+            elif leave.unit != hrself.TIME_UNIT_HOUR:
+                compute_duration = self._duration(cr, uid, leave.type_id.id, leave.am_pm, activities).get('value', {}).get('duration', -1)
+                disable_check = self._disable_checks(cr, uid, leave.type_id.id, leave.activity_context_id.id)
+                if leave.duration != compute_duration and not disable_check:
+                    return (compute_duration, hrself.TIME_UNIT_DAY_LABEL)
+                
         return False
 
     def _check_priority(self, cr, uid, ids, context=None):
@@ -1068,7 +1037,7 @@
         
         allowed = self._check_allowed_duration(cr, uid, ids, context=context)
         if allowed :
-            raise osv.except_osv(_('Warning!'), _('The leave request duration is greater than allowed. \n You have %.2f %s(s) left.') % allowed)
+            raise osv.except_osv(_('Warning!'), _('The leave request duration is different than allowed. \n %.2f %s(s) is allowed.') % allowed)
         
         for leave_request in self.browse(cr, uid, ids, context=context):
             type_name = self._check_priority(cr, uid, ids, context)
 
=== modified file 'hrself_holidays/view/hrself_holidays_view.xml'
--- hrself_holidays/view/hrself_holidays_view.xml	2011-11-24 10:12:14 +0000
+++ hrself_holidays/view/hrself_holidays_view.xml	2011-11-25 16:57:23 +0000
@@ -204,15 +204,15 @@
             <field name="arch" type="xml">
                 <form string="Leave Request">
                     <group col="6" colspan="4">
-                        <field name="employee_id" on_change="onchange_employee_id(employee_id,date_from,date_to,type_id,am_pm,context)"/>
-                        <field name="date_from" on_change="onchange_date_from(employee_id,date_from,date_to,type_id,am_pm,context)"/>
-                        <field name="date_to" required="1" on_change="onchange_date_to(employee_id,date_to,date_from,type_id,am_pm,context)"/>
-                        <field name="type_id" default_focus="1" on_change="onchange_type(employee_id,date_from,date_to,type_id,am_pm,context)" context="{'employee_id': employee_id, 'date_from': date_from, 'date_to': date_to}" attrs="{'readonly': ['|', ('date_from', '=', False), ('employee_id', '=', False)]}"/>
-                        <field name="duration" on_change="onchange_duration(employee_id,date_from,date_to,type_id,duration,unit,am_pm,context)"/>
-                        <field name="unit" on_change="onchange_unit(employee_id,date_from,date_to,type_id,unit,am_pm,context)"/>
-                        <field name="reason_id" domain="[('type_id', '=', type_id)]"/>
-                        <field name="name"/>
-                        <field name="am_pm" on_change="onchange_am_pm(employee_id,date_from,date_to,type_id,am_pm,context)"/>
+                        <field name="employee_id" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="date_from" on_change="onchange_date(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="date_to" required="1" on_change="onchange_date(employee_id,date_from,date_to,type_id,am_pm, context)" />
+                        <field name="type_id" default_focus="1" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)" context="{'employee_id': employee_id, 'date_from': date_from, 'date_to': date_to}" attrs="{'readonly': [('employee_id', '=', False)]}" />
+                        <field name="duration"/>
+                        <field name="unit" />
+                        <field name="reason_id" domain="[('type_id', '=', type_id)]" />
+                        <field name="name" />
+                        <field name="am_pm" on_change="onchange_date_type(employee_id,date_from,date_to,type_id,am_pm, context)"/>
                         <!-- Duration (in hour) is visible when the unit is day.
                         So the opposite is: duration (in hour) is invisible when the unit is not day. -->
                         <field name="duration_in_hour" attrs="{'invisible': [('unit', '!=', 1)]}"/>