[ADD]:added constraints on phases when date_start or date_end field modified,changed...

bzr revid: rvo@tinyerp.co.in-20100218100731-cng5emi7udnf0fdf

diff --git a/addons/project_long_term/project.py b/addons/project_long_term/project.py
index ffe3ac3..d8aae8b 100644 (file)
--- a/addons/project_long_term/project.py
+++ b/addons/project_long_term/project.py
@@ -20,18 +20,18 @@
 ##############################################################################
 
 from lxml import etree
-from mx import DateTime
-from mx.DateTime import now
+import mx.DateTime
 import time
 from tools.translate import _
-
 from osv import fields, osv
-from tools.translate import _
+
 
 class project_phase(osv.osv):
     _name = "project.phase"
     _description = "Project Phase"
 
+
+
     def _check_recursion(self,cr,uid,ids):
          obj_self = self.browse(cr, uid, ids[0])
          prev_ids = obj_self.previous_phase_ids
@@ -72,6 +72,7 @@ class project_phase(osv.osv):
              next_ids = next_phase_ids
          return True
 
+
     _columns = {
         'name': fields.char("Phase Name", size=64, required=True),
         'date_start': fields.datetime('Starting Date'),
@@ -95,6 +96,94 @@ class project_phase(osv.osv):
     _constraints = [
         (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids','previous_phase_ids'])
     ]
+
+    def timeformat_convert(self,cr, uid, time_string, context={}):
+        # To Convert input time string:: 8.5 to output time string 8:30
+        split_list = str(time_string).split('.')
+        hour_part = split_list[0]
+        mins_part = split_list[1]
+        round_mins  = int(round(float(mins_part) * 60,-2))
+        converted_string = hour_part + ':' + str(round_mins)[0:2]
+        return converted_string
+
+    def compute_hours(self,cr,uid,calendar_id,context = None):
+        #  To compute average hours of the working calendar
+
+        resource_week_pool = self.pool.get('resource.calendar.week')
+        week_ids = resource_week_pool.search(cr,uid,[('calendar_id','=',calendar_id)])
+        week_obj = resource_week_pool.read(cr,uid,week_ids,['dayofweek','hour_from','hour_to'])
+        hours = []
+        hr = 0
+        wk_days = []
+        for week in week_obj:
+            if week['dayofweek'] not in wk_days:
+                wk_days.append(week['dayofweek'])
+            hour_from_str = self.timeformat_convert(cr,uid,week['hour_from'])
+            hour_to_str = self.timeformat_convert(cr,uid,week['hour_to'])
+            hours.append(week['hour_from'])
+            hours.append(week['hour_to'])
+
+        for hour in range(len(hours)):
+                if hour%2 ==0:
+                    hr += float(hours[hour+1]) - float(hours[hour])
+        return hr/len(wk_days)
+
+    def constraint_date_start(self,cr,uid,phase,date_end,context=None):
+       # Recursive call for all previous phases if change in date_start < older time
+
+       resource_cal_pool = self.pool.get('resource.calendar')
+       calendar_id = phase.project_id.resource_calendar_id.id
+       avg_hours = self.compute_hours(cr,uid,calendar_id)
+       hours = phase.duration * avg_hours
+       work_time = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, date_end, hours or 0.0)
+       dt_start = work_time[0][0].strftime('%Y-%m-%d %H:%M:%S')
+       self.write(cr,uid,[phase.id],{'date_start':dt_start,'date_end':date_end.strftime('%Y-%m-%d %H:%M:%S')})
+
+    def constraint_date_end(self,cr,uid,phase,date_start,context=None):
+       # Recursive call for all next phases if change in date_ebd > older time
+
+       resource_cal_pool = self.pool.get('resource.calendar')
+       calendar_id = phase.project_id.resource_calendar_id.id
+       avg_hours = self.compute_hours(cr,uid,calendar_id)
+       hours = phase.duration * avg_hours
+       work_time = resource_cal_pool.interval_get(cr, uid, calendar_id or False, date_start, hours or 0.0)
+       dt_end = work_time[-1][1].strftime('%Y-%m-%d %H:%M:%S')
+       self.write(cr,uid,[phase.id],{'date_start':date_start.strftime('%Y-%m-%d %H:%M:%S'),'date_end':dt_end})
+
+    def write(self, cr, uid, ids, vals,context=None):
+        phase = self.browse(cr,uid,ids[0])
+        resource_cal_pool = self.pool.get('resource.calendar')
+        calendar_id = phase.project_id.resource_calendar_id.id
+        avg_hours = self.compute_hours(cr,uid,calendar_id)
+
+        if not context:
+            context = {}
+# write method changes the date_start and date_end
+#for previous and next phases respectively based on valid condition
+
+        if vals.get('date_start'):
+            if vals['date_start'] < phase.date_start:
+                dt_start = mx.DateTime.strptime(vals['date_start'],'%Y-%m-%d %H:%M:%S')
+                hrs = phase.duration * avg_hours
+                work_times = resource_cal_pool.interval_get(cr, uid, calendar_id or False, dt_start, hrs or 0.0)
+                vals['date_end'] = work_times[-1][1].strftime('%Y-%m-%d %H:%M:%S')
+                super(project_phase, self).write(cr, uid, ids, vals, context=context)
+
+                for prv_phase in phase.previous_phase_ids:
+                   self.constraint_date_start(cr,uid,prv_phase,dt_start)
+
+        if vals.get('date_end'):
+            if vals['date_end'] > phase.date_end:
+                dt_end = mx.DateTime.strptime(vals['date_end'],'%Y-%m-%d %H:%M:%S')
+                hrs = phase.duration * avg_hours
+                work_times = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, dt_end, hrs or 0.0)
+                vals['date_start'] = work_times[0][0].strftime('%Y-%m-%d %H:%M:%S')
+                super(project_phase, self).write(cr, uid, ids, vals, context=context)
+
+                for next_phase in phase.next_phase_ids:
+                   self.constraint_date_end(cr,uid,next_phase,dt_end)
+        return super(project_phase, self).write(cr, uid, ids, vals, context=context)
+
 project_phase()
 
 class project_resource_allocation(osv.osv):

diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py
index 2d4cf9f..7778de6 100644 (file)
--- a/addons/project_long_term/wizard/compute_phases_date.py
+++ b/addons/project_long_term/wizard/compute_phases_date.py
@@ -175,7 +175,6 @@ class wizard_compute_phases(wizard.interface):
 
         def phase_schedule(cr,uid,phase,start_date,avg_hour = 0.0):
            if phase:
-
                 #    To get resources and the duration for the phase
                 resources_list = resource_list(cr,uid,phase)
                 if not avg_hour:
@@ -211,9 +210,8 @@ class wizard_compute_phases(wizard.interface):
                     end_date = e_date
 
                 #    Writing the dates back
-                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date,'date_end':end_date})
+                phase_pool.write(cr,uid,[phase.id],{'date_start':start_date.strftime('%Y-%m-%d %H:%M:%S'),'date_end':end_date.strftime('%Y-%m-%d %H:%M:%S')})
                 date_start = end_date
-
                 #    Recursive calling the next phases till all the phases are scheduled
                 for phase in phase.next_phase_ids:
                    phase_schedule(cr,uid,phase,date_start)

diff --git a/addons/resource/__init__.py b/addons/resource/__init__.py
index 2aa86a9..77485b4 100755 (executable)
--- a/addons/resource/__init__.py
+++ b/addons/resource/__init__.py
@@ -20,6 +20,7 @@
 ##############################################################################
 
 import resource
+import faces
 
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:

diff --git a/addons/resource/resource.py b/addons/resource/resource.py
index 7ac36e5..aac885c 100755 (executable)
--- a/addons/resource/resource.py
+++ b/addons/resource/resource.py
@@ -36,50 +36,30 @@ class resource_calendar(osv.osv):
     _defaults = {
         'company_id': lambda self,cr,uid,c: self.pool.get('res.company')._company_default_get(cr, uid, 'resource.calendar', c)
     }
-    def interval_min_get(self, cr, uid, id, dt_from, hours , resource=0):
-        dt_leave = []
+    def interval_min_get(self, cr, uid, id, dt_from, hours):
         if not id:
             return [(dt_from-mx.DateTime.RelativeDateTime(hours=int(hours)*3), dt_from)]
-        if resource:
-            resource_leave_ids = self.pool.get('resource.calendar.leaves').search(cr,uid,[('resource_id','=',resource)])
-            if resource_leave_ids:
-                res_leaves = self.pool.get('resource.calendar.leaves').read(cr,uid,resource_leave_ids,['date_from','date_to'])
-                for i in range(len(res_leaves)):
-                    dtf = mx.DateTime.strptime(res_leaves[i]['date_from'],'%Y-%m-%d %H:%M:%S')
-                    dtt = mx.DateTime.strptime(res_leaves[i]['date_to'],'%Y-%m-%d %H:%M:%S')
-                    leave_days = ((dtt - dtf).days) + 1
-                    for x in range(int(leave_days)):
-                        dt_leave.append((dtf + mx.DateTime.RelativeDateTime(days=x)).strftime('%Y-%m-%d'))
-                    dt_leave.sort()
         todo = hours
         cycle = 0
         result = []
         maxrecur = 100
         current_hour = dt_from.hour
         while (todo>0) and maxrecur:
-            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from", (dt_from.day_of_week,id))
+            cr.execute("select hour_from,hour_to from resource_calendar_week where dayofweek='%s' and calendar_id=%s order by hour_from desc", (dt_from.day_of_week,id))
             for (hour_from,hour_to) in cr.fetchall():
-                    if (hour_to>current_hour) and (todo>0):
-                        m = max(hour_from, current_hour)
-                        if (hour_to-m)>todo:
-                            hour_to = m+todo
-                        d1 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(m)),int((m%1) * 60))
-                        d2 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(hour_to)),int((hour_to%1) * 60))
-                        dt1 = d1.strftime('%Y-%m-%d')
-                        dt2 = d2.strftime('%Y-%m-%d')
-                        for i in range(len(dt_leave)):
-                            if dt1 == dt_leave[i]:
-                                dt_from += mx.DateTime.RelativeDateTime(days=1)
-                                d1 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(m)),int((m%1) * 60))
-                                d2 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(hour_to)),int((hour_to%1) * 60))
-                                dt1 = d1.strftime('%Y-%m-%d')
-                                dt2 = d2.strftime('%Y-%m-%d')
-                        result.append((d1, d2))
-                        current_hour = hour_to
-                        todo -= (hour_to - m)
-            dt_from += mx.DateTime.RelativeDateTime(days=1)
-            current_hour = 0
+                if (hour_from<current_hour) and (todo>0):
+                    m = min(hour_to, current_hour)
+                    if (m-hour_from)>todo:
+                        hour_from = m-todo
+                    d1 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(hour_from)),int((hour_from%1) * 60))
+                    d2 = mx.DateTime.DateTime(dt_from.year,dt_from.month,dt_from.day,int(math.floor(m)),int((m%1) * 60))
+                    result.append((d1, d2))
+                    current_hour = hour_from
+                    todo -= (m-hour_from)
+            dt_from -= mx.DateTime.RelativeDateTime(days=1)
+            current_hour = 24
             maxrecur -= 1
+        result.reverse()
         return result
 
     def interval_get(self, cr, uid, id, dt_from, hours, resource=0, byday=True):