pengyuthon/odoo_source
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

merge

Browse Source 
bzr revid: fp@tinyerp.com-20100216064944-s7z3vifgho5cnail
This commit is contained in:
Fabien Pinckaers
2010-02-16 07:49:44 +01:00
parent 1f40de2750 32a48e1993
commit cf86e95b4c
2 changed files with 38 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/wizard/compute_tasks_date.py
+34 -32
View File
@@ -26,10 +26,12 @@ import datetime
from resource.faces import *
from new import classobj
import operator
import time
compute_form = """<?xml version="1.0" ?>
<form string="Compute Scheduling of Tasks">
<field name="project_id" colspan="4"/>
<field name= "date_from" colspan="4"/>
</form>"""
success_msg = """<?xml version="1.0" ?>
@@ -39,8 +41,9 @@ success_msg = """<?xml version="1.0" ?>
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
@@ -71,6 +74,7 @@ def leaves_resource(cr,uid,id):
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')
@@ -89,8 +93,7 @@ class wizard_compute_tasks(wizard.interface):
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(project.date_start,"%Y-%m-%d"),"%Y-%m-%d %H:%M")
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
@@ -154,31 +157,28 @@ class wizard_compute_tasks(wizard.interface):
resource_objs = []
for no in range(len(resource)):
leaves = []
resource_eff = 1.00
resource_id = resource_pool.search(cr,uid,[('user_id','=',resource[no].id)])
if resource_id and wktime_cal:
# Getting list of leaves for specific resource
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)}))
if resource_id:
# Getting the efficiency for specific resource
resource_eff = resource_pool.browse(cr,uid,resource_id)[0].time_efficiency
# To create dynamic no of tasks
def tasks(j,eff):
def task():
"""
task is a dynamic method!
"""
effort = eff
task.__doc__ = "TaskNO%d" %j
task.__name__ = "task%d" %j
return task
# 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
def tasks_resource(j,eff,obj):
def tasks_resource(j,eff,priorty = 500,obj=None):
def task():
"""
task is a dynamic method!
"""
effort = eff
resource = obj
if obj:
resource = obj
priority = priorty
task.__doc__ = "TaskNO%d" %j
task.__name__ = "task%d" %j
return task
@@ -188,6 +188,8 @@ class wizard_compute_tasks(wizard.interface):
title = project.name
start = date_start
resource = reduce(operator.or_,resource_objs)
minimum_time_unit = 1
# If project has calendar
if wktime_cal:
working_days = wktime_cal
@@ -196,27 +198,27 @@ class wizard_compute_tasks(wizard.interface):
# 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:
for resource_object in resource_objs:
for resource_object in resource_objs:
if resource_object.__name__ == task_obj[i].user_id.name:
task = tasks_resource(i,hours,resource_object)
task = tasks_resource(i,hours,priorty,resource_object)
else:
task = tasks(i,hours)
task = tasks_resource(i,hours,priorty)
project = BalancedProject(Project)
task_no = len(task_obj)
loop_no = 0
for t in project:
no2 = loop_no
while loop_no <= task_no:
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,[task_obj[loop_no - 1].id],{'date_start':s_date,'date_end':e_date,'user_id':user_id[0]})
loop_no = task_no + 1
loop_no = no2
s_date = t.start.to_datetime()
e_date = t.end.to_datetime()
if loop_no == 0:
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]})
loop_no +=1
return {}
states = {
addons/resource/faces/task.py
+4 -6
View File
@@ -1941,7 +1941,7 @@ class Task(object):
func.task_func = instrumented # will be used in the gui
self._function = instrumented
self.name = func.func_name
self.name = name
self.up = parent
self.children = []
self._sources = {} # all tasks, I am linked to
@@ -2548,7 +2548,6 @@ class Task(object):
#@+node:Setting methods
#@+node:_set_attrib
def _set_attrib(self, name, value):
if value is _NEVER_USED_: return
try:
@@ -2564,11 +2563,11 @@ class Task(object):
#@ << add child task >>
#@+node:<< add child task >>
try:
task = self.__dict__[name]
task = self.__dict__[value.func_name]
except KeyError:
task = Task(value, name, self, len(self.children) + 1)
task = Task(value, value.func_name, self, len(self.children) + 1)
self.children.append(task)
setattr(self, task.name, task)
setattr(self, value.func_name, task)
return
#@nonl
#@-node:<< add child task >>
@@ -3698,7 +3697,6 @@ class AdjustedProject(_AllocationPoject):
for t in balancing_list:
src = base.get_task(t.path)
if src.end <= now and src.complete == 100:
#@ << copy the attribs of complete tasks >>
#@+node:<< copy the attribs of complete tasks >>