[ADD] Project_long_term: schedule phase tasks date wizard => osv memory convert

bzr revid: mra@tinyerp.com-20100406122052-ur6vzzkdm37xw2t0

6 files changed, 74 insertions, 28 deletions

diff --git a/addons/project_long_term/__terp__.py b/addons/project_long_term/__terp__.py
index 817263de17e..99bce80caca 100644
--- a/addons/project_long_term/__terp__.py
+++ b/addons/project_long_term/__terp__.py
@@ -41,10 +41,12 @@
     "update_xml": [
         "security/ir.model.access.csv",
         "project_long_term_wizard.xml" ,
+        "wizard/project_schedule_tasks_view.xml",
         "project_long_term_view.xml",
         "project_long_term_workflow.xml",
         "wizard/project_compute_phases_view.xml",
-        "wizard/project_compute_tasks_view.xml"
+        "wizard/project_compute_tasks_view.xml",
+
     ],
     'installable': True,
     'active': False,
diff --git a/addons/project_long_term/project_long_term_view.xml b/addons/project_long_term/project_long_term_view.xml
index 53eaba2e4a9..2deb173b531 100644
--- a/addons/project_long_term/project_long_term_view.xml
+++ b/addons/project_long_term/project_long_term_view.xml
@@ -130,7 +130,7 @@
 									</notebook>
                                   </form>
                              </field>
-                           	<button name="%(wizard_schedule_task)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
+                           	<button name="%(action_project_schedule_tasks)d" string="Schedule Tasks" type="action" icon="gtk-jump-to"/>
                         </page>
                     </notebook>
                     <newline/>
diff --git a/addons/project_long_term/project_long_term_wizard.xml b/addons/project_long_term/project_long_term_wizard.xml
index 1469661c817..98dfabb323e 100644
--- a/addons/project_long_term/project_long_term_wizard.xml
+++ b/addons/project_long_term/project_long_term_wizard.xml
@@ -3,7 +3,7 @@
     <data>
 
         <!--<wizard id="wizard_compute_phase" menu="False" model="project.phase" name="wizard.compute.phases" string="Compute Phase Scheduling"/>-->
-        <wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>
+        <!--<wizard id="wizard_schedule_task" menu="False" model="project.phase" name="phase.schedule.tasks" string="Schedule Tasks"/>-->
         <!--<wizard id="wizard_compute_task" model="project.task" menu="False" name="wizard.compute.tasks" string="Compute Task Scheduling"/>-->
 
 		<menuitem icon="terp-project" id="base.menu_main" name="Project Management" sequence="1"/>
diff --git a/addons/project_long_term/wizard/__init__.py b/addons/project_long_term/wizard/__init__.py
index 63a69582281..fb8a29449f7 100644
--- a/addons/project_long_term/wizard/__init__.py
+++ b/addons/project_long_term/wizard/__init__.py
@@ -21,7 +21,7 @@
 
 import project_compute_phases
 import project_compute_tasks
-import schedule_tasks
+import project_schedule_tasks
 import working_calendar
 
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/schedule_tasks.py b/addons/project_long_term/wizard/project_schedule_tasks.py
index 4a170859032..2d0071547be 100644
--- a/addons/project_long_term/wizard/schedule_tasks.py
+++ b/addons/project_long_term/wizard/project_schedule_tasks.py
@@ -23,24 +23,36 @@ from resource.faces import *
 from new import classobj
 import operator
 
+from tools.translate import _
+from osv import osv, fields
+
 import working_calendar as wkcal
 
-import wizard
-import pooler
-from tools.translate import _
+class project_schedule_task(osv.osv_memory):
 
-success_msg = """<?xml version="1.0" ?>
-<form string="Compute Scheduling of Tasks">
-    <label string="Task Scheduling completed successfully."/>
-</form>"""
+    _name = "project.schedule.tasks"
+    _description = 'project.schedule.tasks'
+    _columns = {
+        'msg': fields.char('Message', size=64)
+                }
+    _defaults = {
+         'msg': 'Task Scheduling Completed Successfully'
+                }
 
-class wizard_schedule_task(wizard.interface):
+    def default_get(self, cr, uid, fields_list, context=None):
+        res = super(project_schedule_task, self).default_get(cr, uid, fields_list, context)
+        self.compute_date(cr, uid, context=context)
+        return res
 
-    def _create_resources(self, cr, uid, phase, context={}):
+    def create_resources(self, cr, uid, phase, context=None):
         """
         Return a list of  Resource Class objects for the resources allocated to the phase.
         """
         resource_objs = []
+
+        if context is None:
+            context = {}
+
         for resource in phase.resource_ids:
             res = resource.resource_id
             leaves = []
@@ -57,15 +69,21 @@ class wizard_schedule_task(wizard.interface):
                                           }))
         return resource_objs
 
-    def _compute_date(self, cr, uid, data, context={}):
+    def compute_date(self, cr, uid, context=None):
         """
         Schedule the tasks according to resource available and priority.
         """
-        pool = pooler.get_pool(cr.dbname)
-        phase_obj = pool.get('project.phase')
-        task_obj = pool.get('project.task')
-        user_obj = pool.get('res.users')
-        phase = phase_obj.browse(cr, uid, data['id'], context=context)
+
+        phase_obj = self.pool.get('project.phase')
+        task_obj = self.pool.get('project.task')
+        user_obj = self.pool.get('res.users')
+
+        if context is None:
+            context = {}
+
+        if not 'active_id' in context:
+            return {}
+        phase = phase_obj.browse(cr, uid, context['active_id'], context=context)
         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()
@@ -78,7 +96,7 @@ class wizard_schedule_task(wizard.interface):
                     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
-            resources = self._create_resources(cr, uid, phase)
+            resources = self.create_resources(cr, uid, phase)
             priority_dict = {'0': 1000, '1': 800, '2': 500, '3': 300, '4': 100}
             # Create dynamic no of tasks with the resource specified
             def create_tasks(j, eff, priorty=500, obj=False):
@@ -101,7 +119,7 @@ class wizard_schedule_task(wizard.interface):
                 try:
                     resource = reduce(operator.or_, resources)
                 except:
-                    raise wizard.except_wizard(_('Error'), _('Phase must have resources assigned !'))
+                    raise osv.except_osv(_('Error'), _('Phase must have resources assigned !'))
                 minimum_time_unit = 1
                 if calendar_id:            # If project has working calendar
                     working_days = wkcal.compute_working_calendar(cr, uid, calendar_id)
@@ -136,11 +154,6 @@ class wizard_schedule_task(wizard.interface):
                                                                     context=ctx)
                 loop_no +=1
         return {}
-    states = {
-        'init': {
-            'actions': [_compute_date],
-            'result': {'type':'form','arch':success_msg,'fields':{}, 'state':[('end', 'Ok', 'gtk-ok', True)]},
-        }
-    }
-wizard_schedule_task('phase.schedule.tasks')
+
+project_schedule_task()
 # vim:expandtab:smartindent:tabstop=4:softtabstop=4:shiftwidth=4:
diff --git a/addons/project_long_term/wizard/project_schedule_tasks_view.xml b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
new file mode 100644
index 00000000000..1011f366aa5
--- /dev/null
+++ b/addons/project_long_term/wizard/project_schedule_tasks_view.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="utf-8"?>
+<openerp>
+    <data>
+
+    	<record id="view_project_schedule_tasks" model="ir.ui.view">
+            <field name="name">Schedule Tasks</field>
+            <field name="model">project.schedule.tasks</field>
+            <field name="type">form</field>
+            <field name="arch" type="xml">
+              	<form string="Schedule Tasks">
+              		  <label string="Task Scheduling completed successfully."/>
+		              <group colspan="4" col="6">
+		            		<button  icon="gtk-ok" colspan="4" special="cancel" string="_Ok"/>
+		              </group>
+			  	</form>
+            </field>
+		</record>
+
+		<record id="action_project_schedule_tasks" model="ir.actions.act_window">
+	           <field name="name">Schedule Tasks</field>
+	           <field name="type">ir.actions.act_window</field>
+	           <field name="res_model">project.schedule.tasks</field>
+	           <field name="view_type">form</field>
+	           <field name="view_mode">form</field>
+	           <field name="view_id" ref="view_project_schedule_tasks"/>
+		       <field name="context">{'record_id' : active_id}</field>
+	           <field name="target">new</field>
+    	</record>
+
+    </data>
+</openerp>
\ No newline at end of file