Project management improvements

bzr revid: hda@tinyerp.com-20100226132006-lomo55f42zug2o1n

1 files changed, 140 insertions, 13 deletions

diff --git a/addons/project_long_term/project.py b/addons/project_long_term/project.py
index ffe3ac38842..df21511434f 100644
--- a/addons/project_long_term/project.py
+++ b/addons/project_long_term/project.py
@@ -20,18 +20,17 @@
 ##############################################################################
 
 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
@@ -51,7 +50,7 @@ class project_phase(osv.osv):
 
          #iter prev_ids
          while prev_ids:
-             cr.execute('select distinct prv_phase_id from project_phase_previous_rel where phase_id in ('+','.join(map(str, prev_ids))+')')
+             cr.execute('select distinct prv_phase_id from project_phase_rel where next_phase_id in ('+','.join(map(str, prev_ids))+')')
              prv_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
              if obj_self.id in prv_phase_ids:
                  return False
@@ -62,7 +61,7 @@ class project_phase(osv.osv):
 
         #iter next_ids
          while next_ids:
-             cr.execute('select distinct next_phase_id from project_phase_next_rel where phase_id in ('+','.join(map(str, next_ids))+')')
+             cr.execute('select distinct next_phase_id from project_phase_rel where prv_phase_id in ('+','.join(map(str, next_ids))+')')
              next_phase_ids = filter(None, map(lambda x: x[0], cr.fetchall()))
              if obj_self.id in next_phase_ids:
                  return False
@@ -72,6 +71,14 @@ class project_phase(osv.osv):
              next_ids = next_phase_ids
          return True
 
+    def _check_dates(self, cr, uid, ids):
+         phase = self.read(cr, uid, ids[0],['date_start','date_end'])
+         if phase['date_start'] and phase['date_end']:
+             if phase['date_start'] > phase['date_end']:
+                 return False
+         return True
+
+
     _columns = {
         'name': fields.char("Phase Name", size=64, required=True),
         'date_start': fields.datetime('Starting Date'),
@@ -79,22 +86,143 @@ class project_phase(osv.osv):
         'constraint_date_start': fields.datetime('Constraint Starting Date'),
         'constraint_date_end': fields.datetime('Constraint End Date'),
         'project_id': fields.many2one('project.project', 'Project', required=True),
-        'next_phase_ids': fields.many2many('project.phase', 'project_phase_next_rel', 'phase_id', 'next_phase_id', 'Next Phases'),
-        'previous_phase_ids': fields.many2many('project.phase', 'project_phase_previous_rel', 'phase_id', 'prv_phase_id', 'Previous Phases'),
-        'duration': fields.float('Duration'),
-        'product_uom': fields.many2one('product.uom', 'Duration UoM', help="UoM (Unit of Measure) is the unit of measurement for Duration"),
+        'next_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'prv_phase_id', 'next_phase_id', 'Next Phases'),
+        'previous_phase_ids': fields.many2many('project.phase', 'project_phase_rel', 'next_phase_id', 'prv_phase_id', 'Previous Phases'),
+        'sequence': fields.integer('Sequence', help="Gives the sequence order when displaying a list of phases."),
+        'duration': fields.float('Duration',required=True),
+        'product_uom': fields.many2one('product.uom', 'Duration UoM',required=True, help="UoM (Unit of Measure) is the unit of measurement for Duration"),
         'task_ids': fields.one2many('project.task', 'phase_id', "Project Tasks"),
         'resource_ids': fields.one2many('project.resource.allocation', 'phase_id', "Project Resources"),
+        'responsible_id':fields.many2one('res.users', 'Responsible'),
+        'state': fields.selection([('draft', 'Draft'),('open', 'In Progress'),('pending', 'Pending'), ('cancelled', 'Cancelled'), ('done', 'Done')], 'State', readonly=True, required=True,
+                                  help='If the phase is created the state \'Draft\'.\n If the phase is started, the state becomes \'In Progress\'.\n If review is needed the phase is in \'Pending\' state.\
+                                  \n If the phase is over, the states is set to \'Done\'.')
+
      }
 
     _defaults = {
+        'responsible_id': lambda obj,cr,uid,context: uid,
         'date_start': lambda *a: time.strftime('%Y-%m-%d'),
+        'state': lambda *a: 'draft',
+        'sequence': lambda *a: 10,
     }
 
     _order = "name"
     _constraints = [
-        (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids','previous_phase_ids'])
+        (_check_recursion,'Error ! Loops In Phases Not Allowed',['next_phase_ids','previous_phase_ids']),
+        (_check_dates, 'Error! Phase start-date must be lower then Phase end-date.', ['date_start', 'date_end'])
     ]
+
+    def onchange_project(self,cr,uid,ids,project):
+        result = {}
+        if project:
+          project_pool = self.pool.get('project.project')
+          project_id = project_pool.browse(cr,uid,project)
+          if project_id.date_start:
+              result['date_start'] = mx.DateTime.strptime(project_id.date_start,"%Y-%m-%d").strftime('%Y-%m-%d %H:%M:%S')
+              return {'value':result}
+        return {'value':{'date_start':[]}}
+
+    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')
+       uom_pool = self.pool.get('product.uom')
+       resource_pool = self.pool.get('resource.resource')
+       calendar_id = phase.project_id.resource_calendar_id.id
+       if phase.responsible_id.id:
+            resource_id = resource_pool.search(cr,uid,[('user_id','=',phase.responsible_id.id)])
+            calendar_id = resource_pool.browse(cr,uid,resource_id[0]).calendar_id.id
+       default_uom_id = uom_pool.search(cr,uid,[('name','=','Hour')])[0]
+       avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration,default_uom_id)
+       work_time = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, date_end, avg_hours or 0.0,resource_id or False)
+       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_end > older time
+
+       resource_cal_pool = self.pool.get('resource.calendar')
+       uom_pool = self.pool.get('product.uom')
+       resource_pool = self.pool.get('resource.resource')
+       calendar_id = phase.project_id.resource_calendar_id.id
+       if phase.responsible_id.id:
+            resource_id = resource_pool.search(cr,uid,[('user_id','=',phase.responsible_id.id)])
+            calendar_id = resource_pool.browse(cr,uid,resource_id[0]).calendar_id.id
+       default_uom_id = uom_pool.search(cr,uid,[('name','=','Hour')])[0]
+       avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration,default_uom_id)
+       work_time = resource_cal_pool.interval_get(cr, uid, calendar_id or False, date_start, avg_hours or 0.0,resource_id or False)
+       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):
+
+        if not context:
+            context = {}
+
+        if context.get('scheduler',False):
+            return super(project_phase, self).write(cr, uid, ids, vals, context=context)
+
+# if the phase is performed by a resource then its calendar and efficiency also taken
+# otherwise the project's working calendar considered
+        phase = self.browse(cr,uid,ids[0])
+        resource_cal_pool = self.pool.get('resource.calendar')
+        resource_pool = self.pool.get('resource.resource')
+        uom_pool = self.pool.get('product.uom')
+        resource_id = False
+        calendar_id = phase.project_id.resource_calendar_id.id
+
+        if phase.responsible_id.id:
+            resource_id = resource_pool.search(cr,uid,[('user_id','=',phase.responsible_id.id)])
+            calendar_id = resource_pool.browse(cr,uid,resource_id[0]).calendar_id.id
+        default_uom_id = uom_pool.search(cr,uid,[('name','=','Hour')])[0]
+        avg_hours = uom_pool._compute_qty(cr, uid, phase.product_uom.id, phase.duration,default_uom_id)
+
+# 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')
+                work_times = resource_cal_pool.interval_get(cr, uid, calendar_id or False, dt_start, avg_hours or 0.0,resource_id or False)
+                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')
+                work_times = resource_cal_pool.interval_min_get(cr, uid, calendar_id or False, dt_end, avg_hours or 0.0,resource_id or False)
+                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)
+
+    def phase_draft(self, cr, uid, ids,*args):
+        self.write(cr, uid, ids, {'state': 'draft'})
+        return True
+
+    def phase_start(self, cr, uid, ids,*args):
+        self.write(cr, uid, ids, {'state': 'open'})
+        return True
+
+    def phase_pending(self, cr, uid, ids,*args):
+        self.write(cr, uid, ids, {'state': 'pending'})
+        return True
+
+    def phase_cancel(self, cr, uid, ids,*args):
+        self.write(cr, uid, ids, {'state': 'cancelled'})
+        return True
+
+    def phase_done(self, cr, uid, ids,*args):
+        self.write(cr, uid, ids, {'state': 'done'})
+        return True
+
 project_phase()
 
 class project_resource_allocation(osv.osv):
@@ -102,9 +230,8 @@ class project_resource_allocation(osv.osv):
     _description = 'Project Resource Allocation'
     _rec_name = 'resource_id'
     _columns = {
-#        'name': fields.char('Name',size = 64),
         'resource_id': fields.many2one('resource.resource', 'Resource', required=True),
-        'phase_id': fields.many2one('project.phase', 'Project Phase', required=True),
+        'phase_id': fields.many2one('project.phase', 'Project Phase',required=True),
         'useability': fields.float('Useability', help="Useability of this ressource for this project phase in percentage (=50%)"),
     }
     _defaults = {