diff options
Diffstat (limited to 'addons/project_long_term')
| -rw-r--r-- | addons/project_long_term/__terp__.py | 9 | ||||
| -rw-r--r-- | addons/project_long_term/project.py | 153 | ||||
| -rw-r--r-- | addons/project_long_term/project_phase_workflow.xml | 104 | ||||
| -rw-r--r-- | addons/project_long_term/project_view.xml | 50 | ||||
| -rw-r--r-- | addons/project_long_term/project_wizard.xml | 6 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/__init__.py | 1 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/compute_phases_date.py | 247 | ||||
| -rw-r--r-- | addons/project_long_term/wizard/schedule_tasks.py | 137 |
8 files changed, 504 insertions, 203 deletions
diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py index 23a1b2a6297..8eea3ce61c0 100644 --- a/addons/project_long_term/__terp__.py +++ b/addons/project_long_term/__terp__.py @@ -1,6 +1,6 @@ # -*- coding: utf-8 -*- ############################################################################## -# +# # OpenERP, Open Source Management Solution # Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). # @@ -15,7 +15,7 @@ # GNU Affero General Public License for more details. # # You should have received a copy of the GNU Affero General Public License -# along with this program. If not, see <http://www.gnu.org/licenses/>. +# along with this program. If not, see <http://www.gnu.org/licenses/>. # ############################################################################## @@ -32,9 +32,10 @@ "init_xml" : [], "demo_xml" : [#"project_demo.xml" ], - "update_xml": [ + "update_xml": [ + "project_wizard.xml" , "project_view.xml", - "project_wizard.xml" + "project_phase_workflow.xml" ], 'installable': True, 'active': False, 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 = { diff --git a/addons/project_long_term/project_phase_workflow.xml b/addons/project_long_term/project_phase_workflow.xml new file mode 100644 index 00000000000..c1999fc55f9 --- /dev/null +++ b/addons/project_long_term/project_phase_workflow.xml @@ -0,0 +1,104 @@ +<?xml version="1.0" encoding="utf-8"?> +<openerp> + <data> + <record id="wkf_phase" model="workflow"> + <field name="name">project.phase.wkf</field> + <field name="osv">project.phase</field> + <field name="on_create">True</field> + </record> + + <record id="act_draft" model="workflow.activity"> + <field name="wkf_id" ref="wkf_phase"/> + <field name="flow_start">True</field> + <field name="name">phase_draft</field> + <field name="kind">function</field> + <field name="action">phase_draft()</field> + </record> + + <record id="act_start_phase" model="workflow.activity"> + <field name="wkf_id" ref="wkf_phase"/> + <field name="name">phase_start</field> + <field name="kind">function</field> + <field name="action">phase_start()</field> + + </record> + + <record id="act_cancel_phase" model="workflow.activity"> + <field name="wkf_id" ref="wkf_phase"/> + <field name="name">phase_cancel</field> + <field name="flow_stop">True</field> + <field name="kind">function</field> + <field name="action">phase_cancel()</field> + + </record> + + <record id="act_phase_pending" model="workflow.activity"> + <field name="wkf_id" ref="wkf_phase"/> + <field name="name">phase_pending</field> + <field name="kind">function</field> + <field name="action">phase_pending()</field> + </record> + + <record id="act_phase_done" model="workflow.activity"> + <field name="wkf_id" ref="wkf_phase"/> + <field name="name">phase_done</field> + <field name="flow_stop">True</field> + <field name="kind">function</field> + <field name="action">phase_done()</field> + </record> + + <record id="t0" model="workflow.transition"> + <field name="act_from" ref="act_draft"/> + <field name="act_to" ref="act_start_phase"/> + <field name="signal">phase_start</field> + </record> + + <record id="t1" model="workflow.transition"> + <field name="act_from" ref="act_draft"/> + <field name="act_to" ref="act_cancel_phase"/> + <field name="signal">phase_cancel</field> + </record> + + <record id="t2" model="workflow.transition"> + <field name="act_from" ref="act_draft"/> + <field name="act_to" ref="act_phase_done"/> + <field name="signal">phase_done</field> + </record> + + <record id="t3" model="workflow.transition"> + <field name="act_from" ref="act_start_phase"/> + <field name="act_to" ref="act_phase_pending"/> + <field name="signal">phase_pending</field> + </record> + + <record id="t4" model="workflow.transition"> + <field name="act_from" ref="act_phase_pending"/> + <field name="act_to" ref="act_cancel_phase"/> + <field name="signal">phase_cancel</field> + </record> + + <record id="t5" model="workflow.transition"> + <field name="act_from" ref="act_phase_pending"/> + <field name="act_to" ref="act_draft"/> + <field name="signal">phase_draft</field> + </record> + + <record id="t6" model="workflow.transition"> + <field name="act_from" ref="act_start_phase"/> + <field name="act_to" ref="act_cancel_phase"/> + <field name="signal">phase_cancel</field> + </record> + + <record id="t7" model="workflow.transition"> + <field name="act_from" ref="act_start_phase"/> + <field name="act_to" ref="act_phase_done"/> + <field name="signal">phase_done</field> + </record> + + <record id="t8" model="workflow.transition"> + <field name="act_from" ref="act_start_phase"/> + <field name="act_to" ref="act_draft"/> + <field name="signal">phase_draft</field> + </record> + </data> +</openerp>
\ No newline at end of file diff --git a/addons/project_long_term/project_view.xml b/addons/project_long_term/project_view.xml index b2219f8f281..c7178c3f6d0 100644 --- a/addons/project_long_term/project_view.xml +++ b/addons/project_long_term/project_view.xml @@ -19,9 +19,8 @@ <field name="type">tree</field> <field name="priority" eval="5"/> <field name="arch" type="xml"> - <tree string="Project Resource Allocation"> + <tree editable="bottom" string="Project Resource Allocation"> <field name="resource_id"/> - <field name="phase_id"/> <field name="useability"/> </tree> </field> @@ -34,29 +33,56 @@ <form string="Project Phase"> <group colspan="6" col="6"> <field name="name" select="1"/> - <field name="project_id"/> + <field name="project_id" on_change="onchange_project(project_id)"/> + <field name="responsible_id"/> <field name="date_start"/> <field name="date_end"/> - <field name="constraint_date_start"/> - <field name="constraint_date_end"/> <field name="duration"/> <field name="product_uom"/> </group> <notebook colspan="4"> - <page string="Task Detail"> - <separator colspan="4" string="Project's Tasks"/> - <field colspan="4" name="task_ids" nolabel="1"/> - </page> - <page string="Resource Allocation Detail"> + <page string="Resource Allocation Detail"> <separator colspan="4" string="Resource Allocation"/> - <field colspan="4" name="resource_ids" nolabel="1"/> + <field colspan="4" name="resource_ids" nolabel="1"> + <tree editable="bottom" string="Project Resource Allocation"> + <field name="resource_id" context="{'project_id':parent.project_id}"/> + <field name="useability"/> + </tree> + <form string="Project Resource Allocation"> + <field name="resource_id" context="{'project_id':parent.project_id}"/> + <field name="useability"/> + </form> + </field> + <group col="12" colspan="4"> + <field name="state" select="1"/> + <button string="Draft" name="phase_draft" states="open"/> + <button string="Start Phase" name="phase_start" states="pending,draft"/> + <button string="Cancel" name="phase_cancel" states="draft,open,pending"/> + <button string="Done" name="phase_done" states="draft,pending,open"/> + <button string="Pending" name="phase_pending" states="open"/> + </group> </page> <page string="Other Info"> + <group colspan="2" col="2"> + <separator string="Constraints" colspan="2"/> + <field name="constraint_date_start"/> + <field name="constraint_date_end"/> + </group> + <group colspan="2" col="2"> + <separator string="Scheduling" colspan="2"/> + <field name="sequence"/> + </group> <separator colspan="4" string="Next Phases"/> <field colspan="4" name="next_phase_ids" nolabel="1"/> <separator colspan="4" string="Previous Phases"/> <field colspan="4" name="previous_phase_ids" nolabel="1"/> </page> + <page string="Task Detail"> + <separator colspan="4" string="Project's Tasks"/> + <field colspan="4" name="task_ids" nolabel="1"/> + + <button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/> + </page> </notebook> <newline/> </form> @@ -92,7 +118,7 @@ res_model="project.task" src_model="project.phase" view_mode="tree,form" - domain="[('phase_id','=',active_id)]"/> + domain="[('phase_id','=',active_id)]"/> <menuitem action="act_project_phase" id="menu_project_phase" parent="project.menu_project_management" sequence="4"/> diff --git a/addons/project_long_term/project_wizard.xml b/addons/project_long_term/project_wizard.xml index 9f40c2c58bf..c45bcca1b42 100644 --- a/addons/project_long_term/project_wizard.xml +++ b/addons/project_long_term/project_wizard.xml @@ -5,11 +5,13 @@ <wizard id="wizard_delegate_task" menu="False" model="project.task" name="project.task.delegate" string="Delegate Task"/> <wizard id="wizard_attachment_task" model="project.task" name="project.task.attachment" string="All Attachments"/> --> <wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/> - <menuitem icon="terp-project" id="menu_main" name="Project Management"/> + <!--<menuitem icon="terp-project" id="menu_main" name="Project Management"/>--> + <wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/> + <menuitem id="base.menu_pm_planning" name="Planning" parent="base.menu_main" sequence="3"/> <menuitem action="wizard_compute_phase" id="menu_wizard_compute_phase" - parent="menu_main" + parent="base.menu_pm_planning" type="wizard" sequence="1"/> </data> diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py index a38c9720ebc..236fc2892a3 100644 --- a/addons/project_long_term/wizard/__init__.py +++ b/addons/project_long_term/wizard/__init__.py @@ -20,6 +20,7 @@ ############################################################################## import compute_phases_date +import schedule_tasks # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: diff --git a/addons/project_long_term/wizard/compute_phases_date.py b/addons/project_long_term/wizard/compute_phases_date.py index 2d4cf9fd70e..4a2054e4ff6 100644 --- a/addons/project_long_term/wizard/compute_phases_date.py +++ b/addons/project_long_term/wizard/compute_phases_date.py @@ -25,17 +25,17 @@ from tools.translate import _ import datetime from resource.faces import * from new import classobj -import operator +import project.project_resource as proj compute_form = """<?xml version="1.0" ?> <form string="Compute Scheduling of Phases"> - <field name="phase_id" colspan="4"/> + <field name="project_id" colspan="4"/> </form>""" compute_fields = { - 'phase_id': {'string':'Phase', 'type':'many2one', 'relation': 'project.phase', 'required':'True'}, + 'project_id': {'string':'Project', 'type':'many2one', 'relation': 'project.project'}, } @@ -44,188 +44,91 @@ success_msg = """<?xml version="1.0" ?> <label string="Phase Scheduling completed successfully."/> </form>""" -def timeformat_convert(cr, uid, time_string, context={}): -# Function 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 phase_schedule(cr,uid,phase,start_date,calendar_id=False): + pool = pooler.get_pool(cr.dbname) + phase_pool = pool.get('project.phase') + resource_pool = pool.get('resource.resource') + uom_pool = pool.get('product.uom') + wktime_cal = [] + resource_cal = False + phase_resource = False + if phase: + resource_id = resource_pool.search(cr,uid,[('user_id','=',phase.responsible_id.id)]) + if resource_id: + resource_obj = resource_pool.browse(cr,uid,resource_id)[0] + leaves = proj.leaves_resource(cr,uid,calendar_id or False ,resource_id,resource_obj.calendar_id.id) + phase_resource = classobj(str(resource_obj.name),(Resource,),{'__doc__':resource_obj.name,'__name__':resource_obj.name,'vacation':tuple(leaves),'efficiency':resource_obj.time_efficiency}) + 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) + duration = str(avg_hours) + 'H' + + # Creating a new project for each phase + def Project(): + start = start_date + minimum_time_unit = 1 + resource = phase_resource + # If project has working calendar else the default one would be considered + if calendar_id: + working_days = proj.compute_working_calendar(cr,uid,calendar_id) + vacation = tuple(proj.leaves_resource(cr,uid,calendar_id)) + + def phase(): + effort = duration + + project = BalancedProject(Project) + s_date = project.phase.start.to_datetime() + e_date = project.phase.end.to_datetime() + + # According to constraints on date start and date end on phase recalculation done + if phase.constraint_date_start and str(s_date) < phase.constraint_date_start: + start_date = datetime.datetime.strptime(phase.constraint_date_start,'%Y-%m-%d %H:%M:%S') + else: + start_date = s_date + if phase.constraint_date_end and str(e_date) > phase.constraint_date_end: + end_date= datetime.datetime.strptime(phase.constraint_date_end,'%Y-%m-%d %H:%M:%S') + date_start = phase.constraint_date_end[:-3] + else: + end_date = e_date + date_start = end_date -def leaves_resource(cr,uid,id): -# To get the leaves for the resource_ids working on phase + # Writing the dates back + 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')},context={'scheduler':True}) - pool = pooler.get_pool(cr.dbname) - resource_leaves_pool = pool.get('resource.calendar.leaves') - resource_leave_ids = resource_leaves_pool.search(cr,uid,[('resource_id','=',id)]) - leaves = [] - if resource_leave_ids: - res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to']) - for leave in range(len(res_leaves)): - dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S') - dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S') - no = dt_end - dt_start - leave_days = no.days + 1 - [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))] - leaves.sort() - return leaves - -def resource_list(cr,uid,obj): -# To get the resource_ids working on phase - - pool = pooler.get_pool(cr.dbname) - resource_pool = pool.get('resource.resource') - resources = obj.resource_ids - resource_objs = [] - leaves = [] - calendar_id = obj.project_id.resource_calendar_id - for no in range(len(resources)): - resource_id = resource_pool.search(cr,uid,[('id','=',resources[no].resource_id.id)]) - if resource_id and calendar_id: - # Getting list of leaves for specific resource - leaves = leaves_resource(cr,uid,resource_id) - # Creating the faces.Resource object with resource specific efficiency and vacation - resource_objs.append(classobj(str(resources[no].resource_id.name),(Resource,),{'__doc__':resources[no].resource_id.name,'__name__':resources[no].resource_id.name,'efficiency':resources[no].useability/100,'vacation':tuple(leaves)})) - return resource_objs + # Recursive calling the next phases till all the phases are scheduled + for phase in phase.next_phase_ids: + if phase.state in ['draft','open','pending']: + phase_schedule(cr,uid,phase,date_start,phase.project_id.resource_calendar_id.id or False) + else: + continue +# class wizard_compute_phases(wizard.interface): def _compute_date(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) project_pool = pool.get('project.project') phase_pool = pool.get('project.phase') - resource_pool = pool.get('resource.resource') - resource_leaves_pool = pool.get('resource.calendar.leaves') - resource_week_pool = pool.get('resource.calendar.week') - avg_hr = 0.0 - wktime_cal = [] - leaves = [] - phase_id = data['form']['phase_id'] - phase = phase_pool.browse(cr,uid,phase_id) - calendar_id = phase.project_id.resource_calendar_id.id - -# If project has a working calendar then that would be used otherwise -# the default faces calendar would be used - if calendar_id: - time_range = "8:00-8:00" - non_working = "" - wk = {"0":"mon","1":"tue","2":"wed","3":"thu","4":"fri","5":"sat","6":"sun"} - wk_days = {} - wk_time = {} - wktime_list = [] - hours = [] - hr = 0 - 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']) - -# Converting time formats into appropriate format required -# and creating a list like [('mon', '8:00-12:00'), ('mon', '13:00-18:00')] - for week in week_obj: - res_str = "" - if wk.has_key(week['dayofweek']): - day = wk[week['dayofweek']] - wk_days[week['dayofweek']] = wk[week['dayofweek']] - - hour_from_str = timeformat_convert(cr,uid,week['hour_from']) - hour_to_str = timeformat_convert(cr,uid,week['hour_to']) - res_str = hour_from_str + '-' + hour_to_str - hours.append(week['hour_from']) - hours.append(week['hour_to']) - wktime_list.append((day,res_str)) - -# Converting it to format like [('mon', '8:00-12:00', '13:00-18:00')] - for item in wktime_list: - if wk_time.has_key(item[0]): - wk_time[item[0]].append(item[1]) - else: - wk_time[item[0]] = [item[0]] - wk_time[item[0]].append(item[1]) - - for k,v in wk_time.items(): - wktime_cal.append(tuple(v)) - - for hour in range(len(hours)): - if hour%2 ==0: - hr += float(hours[hour+1]) - float(hours[hour]) - avg_hr = hr/len(wktime_cal) - -# For non working days adding [('tue,wed,fri,sat,sun', '8:00-8:00')] - for k,v in wk_days.items(): - if wk.has_key(k): - wk.pop(k) - for v in wk.itervalues(): - non_working += v + ',' - if non_working: - wktime_cal.append((non_working[:-1],time_range)) - -# If project working calendar has any leaves - resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',calendar_id)]) - if resource_leave_ids: - res_leaves = resource_leaves_pool.read(cr,uid,resource_leave_ids,['date_from','date_to']) - for leave in range(len(res_leaves)): - dt_start = datetime.datetime.strptime(res_leaves[leave]['date_from'],'%Y-%m-%d %H:%M:%S') - dt_end = datetime.datetime.strptime(res_leaves[leave]['date_to'],'%Y-%m-%d %H:%M:%S') - no = dt_end - dt_start - leave_days = no.days + 1 - [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(leave_days))] - leaves.sort() - - - 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: - avg_hour = 8.0 - man_days = str(phase.duration * avg_hour) + 'H' - - # Creating a new project for each phase - def Project(): - start = start_date - - # If project has working calendar else the default one would be considered - if wktime_cal: - working_days = wktime_cal - vacation = tuple(leaves) - - def phase(): - effort = man_days - resource = reduce(operator.or_,resources_list) - - project = BalancedProject(Project) - print 'Project Phase Start & End:::',project.phase.name,project.phase.booked_resource,project.phase.start.to_datetime(),project.phase.end.to_datetime() - s_date = project.phase.start.to_datetime() - e_date = project.phase.end.to_datetime() - - # According to constraints on date start and date end on phase recalculation done - if phase.constraint_date_start and str(s_date) < phase.constraint_date_start: - start_date = phase.constraint_date_start - else: - start_date = s_date - if phase.constraint_date_end and str(e_date) > phase.constraint_date_end: - end_date = phase.constraint_date_end[:-3] - else: - end_date = e_date - - # Writing the dates back - phase_pool.write(cr,uid,[phase.id],{'date_start':start_date,'date_end':end_date}) - 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) + # if project mentioned + if data['form']['project_id']: + project_id = project_pool.browse(cr,uid,data['form']['project_id']) + phase_ids = phase_pool.search(cr,uid,[('project_id','=',project_id.id),('state','in',['draft','open','pending']),('previous_phase_ids','=',False)]) - # Phase Scheduling starts from here with the call to phase_schedule method - start_dt = datetime.datetime.strftime((datetime.datetime.strptime(phase.project_id.date_start,"%Y-%m-%d")),"%Y-%m-%d %H:%M") - if avg_hr: - phase_schedule(cr,uid,phase,start_dt,avg_hr) + # else all the draft,open,pending states phases taken else: - phase_schedule(cr,uid,phase,start_dt) - + phase_ids = phase_pool.search(cr,uid,[('state','in',['draft','open','pending']),('previous_phase_ids','=',False)]) + + phase_ids.sort() + phase_objs = phase_pool.browse(cr,uid,phase_ids) + for phase in phase_objs: + start_date = phase.project_id.date_start + if not phase.project_id.date_start: + start_date = datetime.datetime.now().strftime("%Y-%m-%d") + start_dt = datetime.datetime.strftime((datetime.datetime.strptime(start_date,"%Y-%m-%d")),"%Y-%m-%d %H:%M") + calendar_id = phase.project_id.resource_calendar_id.id + phase_schedule(cr,uid,phase,start_dt,calendar_id or False) return {} + states = { 'init': { 'actions': [], diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/schedule_tasks.py new file mode 100644 index 00000000000..ea30718d616 --- /dev/null +++ b/addons/project_long_term/wizard/schedule_tasks.py @@ -0,0 +1,137 @@ +# -*- coding: utf-8 -*- +############################################################################## +# +# OpenERP, Open Source Management Solution +# Copyright (C) 2004-2009 Tiny SPRL (<http://tiny.be>). +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as +# published by the Free Software Foundation, either version 3 of the +# License, or (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with this program. If not, see <http://www.gnu.org/licenses/>. +# +############################################################################## + +import wizard +import pooler +from tools.translate import _ +import datetime +from resource.faces import * +from new import classobj +import operator +import time +import project.project_resource as proj + +success_msg = """<?xml version="1.0" ?> +<form string="Compute Scheduling of Tasks"> + <label string="Task Scheduling completed successfully."/> +</form>""" + +def resource_list(cr,uid,phase): +# To create resources which are the Project Members + + resource_objs = [] + for resource in phase.resource_ids: + res = resource.resource_id + leaves = [] + resource_eff = res.time_efficiency + resource_cal = res.calendar_id.id + wktime_cal = proj.compute_working_calendar(cr,uid,resource_cal) + leaves = proj.leaves_resource(cr,uid,phase.project_id.resource_calendar_id.id or False ,res.id,resource_cal) + resource_objs.append(classobj(str(res.user_id.name),(Resource,),{'__doc__':res.user_id.name,'__name__':res.user_id.name,'vacation':tuple(leaves),'efficiency':resource_eff})) + return resource_objs + +class wizard_schedule_task(wizard.interface): + + def _compute_date(self, cr, uid, data, context): + pool = pooler.get_pool(cr.dbname) + phase_pool = pool.get('project.phase') + task_pool = pool.get('project.task') + user_pool = pool.get('res.users') + phase = phase_pool.browse(cr,uid,data['id']) + task_ids = map(lambda x:x.id,(filter(lambda x:x.state in ['open','draft','pending'] ,phase.task_ids))) + + if task_ids: + task_ids.sort() + tasks = task_pool.browse(cr,uid,task_ids) + wktime_cal = [] + start_date = str(phase.date_start)[:-9] + if not phase.date_start: + if not phase.project_id.date_start: + start_date = datetime.datetime.now().strftime("%Y-%m-%d") + else: + start_date = phase.project_id.date_start + date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date,"%Y-%m-%d"),"%Y-%m-%d %H:%M") + calendar_id = phase.project_id.resource_calendar_id.id + resource_objs = resource_list(cr,uid,phase) + priority_dict = {'0':1000,'1':800,'2':500,'3':300,'4':100} + +# To create dynamic no of tasks with the resource specified + def tasks_resource(j,eff,priorty = 500,obj=False): + def task(): + """ + task is a dynamic method! + """ + effort = eff + if obj: + resource = obj + priority = priorty + task.__doc__ = "TaskNO%d" %j + task.__name__ = "task%d" %j + return task + +# Creating the project with all the tasks and resources + def Project(): + title = "Test Project" + start = date_start + resource = reduce(operator.or_,resource_objs) + minimum_time_unit = 1 + +# If project has calendar + if calendar_id: + working_days = proj.compute_working_calendar(cr,uid,calendar_id) + vacation = tuple(proj.leaves_resource(cr,uid,calendar_id)) + +# Dynamic Creation of tasks + i = 0 + for each_task in tasks: + hours = str(each_task.planned_hours / each_task.occupation_rate)+ 'H' + if each_task.priority in priority_dict.keys(): + priorty = priority_dict[each_task.priority] + if each_task.user_id: + for resource_object in resource_objs: + if resource_object.__name__ == each_task.user_id.name: + task = tasks_resource(i,hours,priorty,resource_object) + else: + task = tasks_resource(i,hours,priorty) + i += 1 + +# Writing back the dates + project = BalancedProject(Project) + loop_no = 0 + for t in project: + s_date = t.start.to_datetime() + e_date = t.end.to_datetime() + if loop_no > 0: + user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)]) + task_pool.write(cr,uid,[tasks[loop_no-1].id],{'date_start':s_date.strftime('%Y-%m-%d %H:%M:%S'),'date_deadline':e_date.strftime('%Y-%m-%d %H:%M:%S'),'user_id':user_id[0]},context={'scheduler':True}) + loop_no +=1 + return {} + + states = { + 'init': { + 'actions': [_compute_date], + 'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok')]}, + } + } +wizard_schedule_task('phase.schedule.tasks') + + +# vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4: |
