From 7300add4a7d90f8d4fae3a897dd8add4902f6751 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Thu, 18 Feb 2010 18:43:18 +0530 Subject: [ADD]:added constraints on parent_ids and child_ids of tasks when date_start and date_end fields modified,improved on_change method on tasks bzr revid: rvo@tinyerp.co.in-20100218131318-mu80ki61iuazu06c --- addons/project/wizard/compute_tasks_date.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index 5dc7c9ae007..c44fb902e87 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -216,7 +216,7 @@ class wizard_compute_tasks(wizard.interface): project_pool.write(cr,uid,[project_id],{'date':e_date}) else: user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)]) - task_pool.write(cr,uid,[task_obj[loop_no-1].id],{'date_start':s_date,'date_deadline':e_date,'user_id':user_id[0]}) + task_pool.write(cr,uid,[task_obj[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]}) loop_no +=1 return {} -- cgit v1.2.3 From eabe16de50d796e35a8c6cfe9b17cfba163cc6b6 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 19 Feb 2010 15:58:28 +0530 Subject: minor changes bzr revid: rvo@tinyerp.co.in-20100219102828-hrehhv0aacv8conw --- addons/project/wizard/compute_tasks_date.py | 21 +++++++++------------ 1 file changed, 9 insertions(+), 12 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index c44fb902e87..c52f0b5f079 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -61,15 +61,13 @@ def leaves_resource(cr,uid,id): 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() + 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 + [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))] + leaves.sort() return leaves class wizard_compute_tasks(wizard.interface): @@ -148,9 +146,8 @@ class wizard_compute_tasks(wizard.interface): 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() + [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))] + leaves.sort() # To create resources which are the Project Members resource = project.members -- cgit v1.2.3 From 512fce7d0729fd45ba000f918a6409ed49153a11 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 26 Feb 2010 16:45:19 +0530 Subject: [IMP]:changes in project module,improved scheduling wizard bzr revid: rvo@tinyerp.co.in-20100226111519-38fiawt3qnz71tvs --- addons/project/wizard/compute_tasks_date.py | 130 ++++------------------------ 1 file changed, 19 insertions(+), 111 deletions(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index c52f0b5f079..558a6116af0 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -26,12 +26,11 @@ import datetime from resource.faces import * from new import classobj import operator -import time +import project.project_resource as proj compute_form = """
- """ success_msg = """ @@ -41,129 +40,36 @@ success_msg = """ compute_fields = { 'project_id': {'string':'Project', 'type':'many2one', 'relation': 'project.project', 'required':'True'}, - 'date_from': {'string':"Start date",'type':'datetime','required':'True' ,'default': lambda *a: time.strftime('%Y-%m-%d %H:%M:%S')}, } -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 leaves_resource(cr,uid,id): -# To get the leaves for the members working on project - - 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 = [] - 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 - [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))] - leaves.sort() - return leaves - class wizard_compute_tasks(wizard.interface): - def _compute_date(self, cr, uid, data, context): pool = pooler.get_pool(cr.dbname) project_pool = pool.get('project.project') task_pool = pool.get('project.task') resource_pool = pool.get('resource.resource') - resource_leaves_pool = pool.get('resource.calendar.leaves') - resource_week_pool = pool.get('resource.calendar.week') user_pool = pool.get('res.users') - project_id = data['form']['project_id'] project = project_pool.browse(cr,uid,project_id) - task_ids = task_pool.search(cr,uid,[('project_id','=',project_id)]) + task_ids = task_pool.search(cr,uid,[('project_id','=',project_id),('state','in',['draft','open','pending'])]) if task_ids: wktime_cal = [] - leaves = [] task_ids.sort() task_obj = task_pool.browse(cr,uid,task_ids) - task_1 = task_obj[0] - date_start = datetime.datetime.strftime(datetime.datetime.strptime(data['form']['date_from'],"%Y-%m-%d %H:%M:%S"),"%Y-%m-%d %H:%M") calendar_id = project.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: - resource_leave_ids = resource_leaves_pool.search(cr,uid,[('calendar_id','=',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 = [] - 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 - 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 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 - 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 - [leaves.append((dt_start + datetime.timedelta(days=x)).strftime('%Y-%m-%d')) for x in range(int(no.days + 1))] - leaves.sort() + date_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M") # To create resources which are the Project Members - resource = project.members resource_objs = [] - for no in range(len(resource)): + for resource in project.members: leaves = [] - resource_eff = 1.00 - resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)]) + resource_id = resource_pool.search(cr,uid,[('user_id','=',resource.id)]) if resource_id: -# Getting the efficiency for specific resource - resource_eff = resource_pool.browse(cr,uid,resource_id)[0].time_efficiency + 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) + resource_objs.append(classobj(str(resource.name),(Resource,),{'__doc__':resource.name,'__name__':resource.name,'vacation':tuple(leaves),'efficiency':resource_obj.time_efficiency})) -# Getting list of leaves for specific resource - if wktime_cal: - leaves = leaves_resource(cr,uid,resource_id) - resource_objs.append(classobj(str(resource[no].name),(Resource,),{'__doc__':resource[no].name,'__name__':resource[no].name,'vacation':tuple(leaves),'efficiency':resource_eff})) priority_dict = {'0':1000,'1':800,'2':500,'3':300,'4':100} # To create dynamic no of tasks with the resource specified @@ -188,21 +94,23 @@ class wizard_compute_tasks(wizard.interface): minimum_time_unit = 1 # If project has calendar - if wktime_cal: - working_days = wktime_cal - vacation = tuple(leaves) + 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 - for i in range(len(task_obj)): - hours = str(task_obj[i].remaining_hours / task_obj[i].occupation_rate)+ 'H' - if task_obj[i].priority in priority_dict.keys(): - priorty = priority_dict[task_obj[i].priority] - if task_obj[i].user_id: + i = 0 + for each_task in task_obj: + 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__ == task_obj[i].user_id.name: + 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 project = BalancedProject(Project) loop_no = 0 -- cgit v1.2.3 From 1adcb50ea377a8847e50b4cd6c6c85e6ed8a67c8 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 26 Feb 2010 17:56:17 +0530 Subject: [IMP]:improved the date start working for phase,tasks scheduling bzr revid: rvo@tinyerp.co.in-20100226122617-l6jvjmckgjqf3chg --- addons/project/wizard/compute_tasks_date.py | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index 558a6116af0..7cf1ad73bbb 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -58,7 +58,10 @@ class wizard_compute_tasks(wizard.interface): task_ids.sort() task_obj = task_pool.browse(cr,uid,task_ids) calendar_id = project.resource_calendar_id.id - date_start = datetime.datetime.strftime(datetime.datetime.strptime(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M") + start_date = project.date_start + if not project.date_start: + start_date = datetime.datetime.now().strftime("%Y-%m-%d") + date_start = datetime.datetime.strftime(datetime.datetime.strptime(start_date,"%Y-%m-%d"),"%Y-%m-%d %H:%M") # To create resources which are the Project Members resource_objs = [] -- cgit v1.2.3 From 64b2f5447f44dee314230597eafd7059ab23d3c1 Mon Sep 17 00:00:00 2001 From: "Rvo (Open ERP)" Date: Fri, 26 Feb 2010 18:17:40 +0530 Subject: code improvement bzr revid: rvo@tinyerp.co.in-20100226124740-etg40tjvsettean8 --- addons/project/wizard/compute_tasks_date.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'addons/project/wizard') diff --git a/addons/project/wizard/compute_tasks_date.py b/addons/project/wizard/compute_tasks_date.py index 7cf1ad73bbb..7f9965367ae 100644 --- a/addons/project/wizard/compute_tasks_date.py +++ b/addons/project/wizard/compute_tasks_date.py @@ -115,6 +115,7 @@ class wizard_compute_tasks(wizard.interface): task = tasks_resource(i,hours,priorty) i += 1 +# Writing back the dates project = BalancedProject(Project) loop_no = 0 for t in project: @@ -126,7 +127,6 @@ class wizard_compute_tasks(wizard.interface): user_id = user_pool.search(cr,uid,[('name','=',t.booked_resource[0].__name__)]) task_pool.write(cr,uid,[task_obj[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]}) loop_no +=1 - return {} states = { -- cgit v1.2.3