Merge lp:~vauxoo/addons-vauxoo/7.0-user_story-rev1-kty into lp:addons-vauxoo/7.0

[Katherine Zaoral (Vauxoo)]

[MERGE] improve the user story view and model

[MERGE] improve the user story view and model

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

There is a problem in the related fields defined at the acceptability.criteria model.
When the realated field is updated through the user.story the related field do not update.
I need to change the store=True to a sensitive store that listen to user.story model changes.
I also presume that I need to change the realated fields to functional fields.
After this changes are corrected I will report for this media that the merge is approve for my side.
regards.

review: Needs Fixing

[lp:~vauxoo/addons-vauxoo/7.0-user_story-rev1-kty]

986. By Katherine Zaoral (Vauxoo) on 2014-02-26

[FIX] add readonly True on the related fields for the user story search pad.

987. By Katherine Zaoral (Vauxoo) on 2014-02-28

[FIX] There was a problem when trying to display the acceptability.criteria
recrods in the corresponding tree view. The group by project do not group
correctly for first instance of the acceptability critearia. I modificate the
project_id field to be a function type of a m2o relationship. Also the field is
now store sensitive to the user.story model and to it self.

988. By Katherine Zaoral (Vauxoo) on 2014-02-28

[IMP] modifcate the get_project_id method to _get_user_story_field method. This
method is use as the function attribute in the functional fields how wants to
extract data from the user.story model. By this the acceptability.critearia
fields that are pull from the user.story model need to have the same field
name.

989. By Katherine Zaoral (Vauxoo) on 2014-02-28

[ADD] apply the same changes of the project_id field over the sk_id field.

990. By Katherine Zaoral (Vauxoo) on 2014-02-28

[ADD] change the tag related field to a functional sentitive storable field.
the field name is change to categ_ids.

991. By Katherine Zaoral (Vauxoo) on 2014-02-28

[ADD] change the user_id related field to a functional sentitive storable
field.

992. By Katherine Zaoral (Vauxoo) on 2014-02-28

[ADD] change the user_execute_id related field to a functional sentitive
storable field.

993. By Katherine Zaoral (Vauxoo) on 2014-02-28

[ADD] add simple data demo.

[Katherine Zaoral (Vauxoo) (kathy-zaoral)]

Jose please check the mp with the new changes.
Please check if it fulfill the goals.
Waiting for your approve
Regards

review: Approve

[Jose Antonio Morales Ponce(vauxoo) - - http://www.vauxoo.com (josemoralesp)]

review: Approve

=== modified file 'user_story/__openerp__.py'
--- user_story/__openerp__.py	2013-04-04 19:05:37 +0000
+++ user_story/__openerp__.py	2014-02-28 03:30:29 +0000
@@ -52,6 +52,7 @@
     "init_xml" : [
     ],
     "demo_xml" : [
+        'demo/demo.xml',
     ],
     "update_xml" : [
         "report/ir_report.xml",

=== modified file 'user_story/data/data.xml'
--- user_story/data/data.xml	2013-04-24 23:51:50 +0000
+++ user_story/data/data.xml	2014-02-28 03:30:29 +0000
@@ -2,6 +2,17 @@
 <openerp>
     <data>
     
+        <!-- User Story Priority -->
+        <record id="usp_urgent" model="user.story.priority">
+            <field name="name">Urgent</field>
+        </record>
+        <record id="usp_priority" model="user.story.priority">
+            <field name="name">Priority</field>
+        </record>
+        <record id="usp_secondary" model="user.story.priority">
+            <field name="name">Secondary</field>
+        </record>
+        
         <!-- Task-related subtypes for messaging / Chatter -->
         <record id="mt_task_new" model="mail.message.subtype">
             <field name="name">Task Created</field>

=== added directory 'user_story/demo'
=== added file 'user_story/demo/demo.xml'
--- user_story/demo/demo.xml	1970-01-01 00:00:00 +0000
+++ user_story/demo/demo.xml	2014-02-28 03:30:29 +0000
@@ -0,0 +1,65 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<openerp>
+    <data noupdate="1">
+
+        <record id="us_1" model="user.story">
+            <field name="name">us 1</field>
+            <field name="owner">ow 1</field>
+            <field name="project_id" ref="project.project_project_1"/>
+        </record>
+
+        <record id="us_2" model="user.story">
+            <field name="name">us 2</field>
+            <field name="owner">ow 2</field>
+            <field name="project_id" ref="project.project_project_1"/>
+        </record>
+
+        <record id="us_3" model="user.story">
+            <field name="name">us 3</field>
+            <field name="owner">ow 3</field>
+            <field name="project_id" ref="project.project_project_2"/>
+        </record>
+
+        <record id="ac_11" model="acceptability.criteria">
+            <field name="name">criterion 1.1</field>
+            <field name="scenario">sc 1.1</field>
+            <field name="accep_crit_id" ref="us_1"/>
+            <field name="development">True</field>
+            <field name="difficulty">low</field>
+        </record>
+
+        <record id="ac_12" model="acceptability.criteria">
+            <field name="name">criterion 1.2</field>
+            <field name="scenario">sc 1.2</field>
+            <field name="accep_crit_id" ref="us_1"/>
+            <field name="accepted">True</field>
+            <field name="difficulty">high</field>
+        </record>
+
+        <record id="ac_21" model="acceptability.criteria">
+            <field name="name">criterion 2.1</field>
+            <field name="scenario">sc 2.1</field>
+            <field name="accep_crit_id" ref="us_2"/>
+            <field name="development">True</field>
+        </record>
+
+        <record id="ac_22" model="acceptability.criteria">
+            <field name="name">criterion 2.2</field>
+            <field name="scenario">sc 2.2</field>
+            <field name="accep_crit_id" ref="us_2"/>
+            <field name="difficulty">low</field>
+        </record>
+
+        <record id="ac_31" model="acceptability.criteria">
+            <field name="name">criterion 3.1</field>
+            <field name="scenario">sc 3.1</field>
+            <field name="accep_crit_id" ref="us_3"/>
+            <field name="difficulty">low</field>
+        </record>
+
+        <record id="group_user_story_manager" model="res.groups">
+            <field name="users" eval="[(4,ref('base.user_root'))]"/>
+        </record>
+
+   </data>
+</openerp>

=== modified file 'user_story/model/user_story.py'
--- user_story/model/user_story.py	2013-10-23 19:58:11 +0000
+++ user_story/model/user_story.py	2014-02-28 03:30:29 +0000
@@ -86,27 +86,25 @@
         
      
     _columns = {
-        'name': fields.char('Title', size=255, required=True, readonly=False),
+        'name': fields.char('Title', size=255, required=True, readonly=False,
+            translate=True),
         'owner': fields.char('Owner', size=255, required=True, readonly=False),
         'code': fields.char('Code', size=64, readonly=False),
         'planned_hours': fields.float('Planned Hours'),
         'project_id': fields.many2one('project.project', 'Project',
                                       required=True),
-        'description': fields.text('Description'),
+        'description': fields.text('Description', translate=True),
         'accep_crit_ids': fields.one2many('acceptability.criteria',
                                           'accep_crit_id',
                                           'Acceptability Criteria',
                                           required=False),
-        'info': fields.text('Other Info'),
-        'priority_level':fields.selection([('urgent','Urgent'),
-                                           ('priority','Priority'),
-                                           ('secondary','Secondary')],
-                                           'Priority Level',
-                                           help='User story level priority,'
-                                                   ' used to define priority'
-                                                   ' for each user story'), 
-        
-        'asumption': fields.text('Asumptions'),
+        'info': fields.text('Other Info', translate=True),
+        'priority_level':fields.many2one(
+            'user.story.priority',
+            'Priority Level',
+            help=('User story level priority, used to define priority for'
+                  ' each user story')), 
+        'asumption': fields.text('Asumptions', translate=True),
         'date': fields.date('Date'),
         'user_id': fields.many2one('res.users', 'Responsible Supervisor',help="Person responsible for interacting with the client to give details of the progress or completion of the User History, in some cases also the supervisor for the correct execution of the user story."),
         'user_execute_id': fields.many2one('res.users', 'Responsible Execution',help="Person responsible for user story takes place, either by delegating work to other human capital or running it by itself. For delegate work should monitor the proper implementation of associated activities."),
@@ -115,11 +113,12 @@
         'task_ids': fields.function(_get_tasks, type='many2many',
                                     relation="project.task",
                                     fnct_inv=_set_task,
-                                    string="Tasksss",
+                                    string="Tasks",
                                     help="""Draft procurement of
                                             the product and location
                                             of that orderpoint"""),
         'categ_ids': fields.many2many('project.category','project_category_user_story_rel','userstory_id','categ_id', string="Tags"),
+        'implementation': fields.text('Implementation Conclusions', translate=True),
     }
     _defaults = {
         'name': lambda *a: None,
@@ -127,7 +126,9 @@
         'user_id': lambda self, cr, uid, ctx: uid,
         'user_execute_id': lambda self, cr, uid, ctx: uid,
         'state': 'draft',
-        'priority_level':'secondary',
+        'priority_level': lambda self, cr, uid, ctx: self.pool.get(
+            'user.story.priority').search(
+                cr, uid, [('name', 'like', 'Secondary')], context=ctx)[0]
     }
 
     def do_draft(self, cr, uid, ids, context=None):
@@ -146,6 +147,16 @@
         return self.write(cr, uid, ids, {'state': 'cancelled'},
                           context=context)
 
+class user_story_priority(osv.Model):
+    """
+    User Story Priority Level
+    """
+
+    _name = 'user.story.priority'
+    _columns = {
+        'name': fields.char('Name', size=255, required=True),
+    }
+
 
 class acceptability_criteria(osv.Model):
     """
@@ -154,17 +165,106 @@
 
     _name = 'acceptability.criteria'
 
+    def _get_ac_ids_by_us_ids(self, cr, uid, us_ids, context=None):
+        """
+        This method is as the method of the sensitive store tuple for the
+        functional fields defined in the current field that pretend to pull
+        data form the user.story model. The method get us_ids and make a search
+        for the acceptability.criteria records that need to be updated.
+        @return a list of the acceptability.criteria that need to be updated.
+        """
+        context = context or {}
+        us_obj = self.pool.get('user.story')
+        ac_obj = self.pool.get('acceptability.criteria')
+        ac_ids = ac_obj.search(
+            cr, uid, [('accep_crit_id', 'in', us_ids)], context=context)
+        return ac_ids
+
+    def _get_user_story_field(self, cr, uid, ids, fieldname, arg, context=None):
+        """
+        Method used as the function for extracting values for the user.story
+        model using functional fields. This method is used for various fields,
+        the fieldname it matters to extract the value, the field name need to
+        be the same from the user.story model.
+        """
+        context = context or {}
+        res = {}.fromkeys(ids)
+        for ac_brw in self.browse(cr, uid, ids, context=context):
+            res[ac_brw.id] = \
+                getattr(ac_brw.accep_crit_id, fieldname, False) and \
+                getattr(ac_brw.accep_crit_id, fieldname).id or False
+        return res
+
     _columns = {
-        'name': fields.char('Title', size=255, required=True, readonly=False),
-        'scenario': fields.text('Scenario', required=True),
+        'name': fields.char('Title', size=255, required=True, readonly=False,
+            translate=True),
+        'scenario': fields.text('Scenario', required=True, translate=True),
         'accep_crit_id': fields.many2one('user.story',
                                          'User Story',
                                          required=True),
         'accepted': fields.boolean('Accepted',
                                    help='Chek if this criteria apply'),
+        'development': fields.boolean('Development'),
+        'difficulty': fields.selection(
+            [('low','Low'),
+             ('medium','Medium'),
+             ('high','High'),
+             ('na','Not Apply')],
+            string='Difficulty'),
+        'project_id': fields.function(
+            _get_user_story_field,
+            type="many2one",
+            relation='project.project',
+            string='Project',
+            help='User Story Project',
+            store={
+                'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
+                'user.story': (_get_ac_ids_by_us_ids, ['project_id'], 20),
+            }),
+        'sk_id': fields.function(
+            _get_user_story_field,
+            type="many2one",
+            relation="sprint.kanban",
+            string='Sprint',
+            help='Sprint Kanban',
+            store={
+                'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
+                'user.story': (_get_ac_ids_by_us_ids, ['sk_id'], 20),
+            }),
+        'categ_ids': fields.function(
+            _get_user_story_field,
+            type="many2one",
+            relation="project.category",
+            string='Tag',
+            help='Tag',
+            store={
+                'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
+                'user.story': (_get_ac_ids_by_us_ids, ['categ_ids'], 20),
+            }),
+        'user_id': fields.function(
+            _get_user_story_field,
+            type="many2one",
+            relation="res.users",
+            string='Responsible Supervisor',
+            help='Responsible Supervisor',
+            store={
+                'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
+                'user.story': (_get_ac_ids_by_us_ids, ['user_id'], 20),
+            }),
+        'user_execute_id': fields.function(
+            _get_user_story_field,
+            type="many2one",
+            relation="res.users",
+            string='Responsible Execution',
+            help='Responsible Execution',
+            store={
+                'acceptability.criteria': (lambda s, c, u, i, ctx: i, ['accep_crit_id'], 16),
+                'user.story': (_get_ac_ids_by_us_ids, ['user_execute_id'], 20),
+            }),
     }
     _defaults = {
         'name': lambda *a: None,
+        'difficulty': 'na',
     }
 
 

=== modified file 'user_story/view/userstory_view.xml'
--- user_story/view/userstory_view.xml	2013-10-23 21:00:08 +0000
+++ user_story/view/userstory_view.xml	2014-02-28 03:30:29 +0000
@@ -46,7 +46,7 @@
 				<group>
 					<field name="planned_hours" />
 					<field name="sk_id" context="{'current_model3': 'sprint.kanban'}" />
-					<field name="priority_level" />
+					<field name="priority_level" widget="selection"/>
                     <field name="categ_ids" widget="many2many_tags" context="{'current_model1': 'project.category'}"/>
 				</group>
 			</group>
@@ -95,10 +95,12 @@
             </page>
           
             <page string="GAP analysis results">
-			  <label for="info" colspan="4" string="5.- Conclusion of analysis" class="oe_horizontal_separator oe_clear"/>
+			  <label for="info" colspan="4" string="5.- Technical Conclusions" class="oe_horizontal_separator oe_clear"/>
               <field name="info" colspan="4" placeholder="Add a other info here ..."/> 
               <label for="asumption" colspan="4" string="6.- Asumptions" class="oe_horizontal_separator oe_clear"/>
               <field name="asumption" colspan="4" placeholder="Add a asumptions here ..."/>
+              <label for="implementation" colspan="4" string="7.- Implementation Conclusions" class="oe_horizontal_separator oe_clear"/>
+              <field name="implementation" colspan="4" placeholder="Add a Implementation Conclusions here ..."/>
             </page>
             
             <page string="Tasks">
@@ -136,6 +138,79 @@
       </field>
     </record>
     
+    <record model="ir.ui.view" id="view_acceptability_criteria_form">
+        <field name="name">acceptability.criteria.form</field>
+        <field name="model">acceptability.criteria</field>
+        <field name="arch" type="xml">
+            <form string="Acceptability Criterion" version="7.0">
+                <sheet string="Acceptability Criterion">
+                    <h1><label for="id" string="Acceptability Criterion" class="oe_horizontal_separator oe_clear"/>
+                        <field name="id" readonly="True"/>
+                        <field name="name" placeholder="Acceptabilit Criterion summary..."/>
+                    </h1>
+                    <group>
+                        <field name="scenario"/>
+                        <field name="accep_crit_id"/>
+                        <field name="accepted"/>
+                        <field name="development"/>
+                        <field name="difficulty"/>
+                    </group>
+                </sheet>
+            </form>
+        </field>
+    </record>
+    
+    <record model="ir.ui.view" id="view_acceptability_criteria_tree">
+        <field name="name">acceptability.criteria.tree</field>
+        <field name="model">acceptability.criteria</field>
+        <field name="arch" type="xml">
+            <tree string="Acceptability Criteria">
+                <field name="id"/>
+                <field name="name"/>
+                <field name="scenario"/>
+                <field name="accep_crit_id"/>
+                <field name="project_id" invisible="True"/>
+                <field name="sk_id" invisible="True"/>
+                <field name="categ_ids" invisible="True"/>
+                <field name="user_id" invisible="True"/>
+                <field name="user_execute_id" invisible="True"/>
+                <field name="accepted"/>
+                <field name="development"/>
+                <field name="difficulty"/>
+            </tree>
+        </field>
+    </record>
+
+    <record id="view_acceptability_criteria_search" model="ir.ui.view">
+        <field name="name">acceptability.criteria.search</field>
+        <field name="model">acceptability.criteria</field>
+        <field name="arch" type="xml">
+            <search string="Acceptability Criteria">
+                <group string="Filter">
+                    <field name="id"/>
+                    <field name="name"/>
+                    <field name="scenario"/>
+                    <field name="accep_crit_id"/>
+                    <field name="accepted"/>
+                    <field name="development"/>
+                    <field name="difficulty"/>
+                </group>
+                <filter name="accept_criteria_development" string="In Development" domain="[('development','=',True)]"/>
+                <filter name="accept_criteria_accepted" string="Accepted" domain="[('accepted','=',True)]"/>
+                <group expand="1" string="Group By...">
+                    <filter name="accept_criteria_user_story_id" string="User Story" context="{'group_by':'accep_crit_id'}"/>
+                    <filter name="accept_criteria_difficulty" string="Difficulty" context="{'group_by':'difficulty'}"/>
+                    <separator/>
+                    <filter name="accept_criteria_project_id" string="Project" context="{'group_by':'project_id'}"/>
+                    <filter name="accept_criteria_sk_id" string="Sprint" context="{'group_by':'sk_id'}"/>
+                    <filter name="accept_criteria_categ_ids" string="Tag" context="{'group_by':'categ_ids'}"/>
+                    <filter name="accept_criteria_user_id" string="Responsible Supervisor" context="{'group_by':'user_id'}"/>
+                    <filter name="accept_criteria_user_execute_id" string="Responsible Execution" context="{'group_by':'user_execute_id'}"/>
+                </group>
+            </search>
+        </field>
+    </record>
+
      <record id="view_userstory_search" model="ir.ui.view">
       <field name="name">user.story.search</field>
       <field name="model">user.story</field>
@@ -173,6 +248,7 @@
       </field>
     </record>
     
+
     <record model="ir.actions.act_window" id="action_my_user_story">
       <field name="name">My User Stories Exc</field>
       <field name="res_model">user.story</field>
@@ -182,8 +258,23 @@
       <field name="view_id" ref="view_userstory_tree"/>
     </record>
  
+    <record model="ir.actions.act_window" id="action_acceptability_criteria">
+      <field name="name">Acceptability Criteria</field>
+      <field name="res_model">acceptability.criteria</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+      <field name="view_id" ref="view_acceptability_criteria_tree"/>
+    </record>
+
+    <record model="ir.actions.act_window" id="action_user_story_priority">
+      <field name="name">Priority Level</field>
+      <field name="res_model">user.story.priority</field>
+      <field name="view_type">form</field>
+      <field name="view_mode">tree,form</field>
+    </record>
+ 
     <record model="ir.actions.act_window" id="action_user_story">
-      <field name="name">User Story</field>
+      <field name="name">User Stories</field>
       <field name="res_model">user.story</field>
       <field name="view_type">form</field>
       <field name="view_mode">tree,form</field>
@@ -200,8 +291,12 @@
       </p>
       </field>
     </record>
-    <menuitem parent="project.menu_project_management" id="menu_action_user_story" action="action_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
-    <menuitem parent="project.menu_project_management" id="menu_action_my_user_story" action="action_my_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
+    <menuitem parent="base.menu_main_pm" sequence="2" id="menu_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user" name="User Story"/>
+    <menuitem parent="menu_user_story" id="menu_action_user_story" action="action_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
+    <menuitem parent="menu_user_story" id="menu_action_my_user_story" action="action_my_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
+    <menuitem parent="menu_user_story" id="menu_acceptability_criteria" action="action_acceptability_criteria" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
+    <menuitem parent="base.menu_definitions" id="menu_conf_user_story" groups="user_story.group_user_story_manager,user_story.group_user_story_user" name="User Story"/>
+    <menuitem parent="menu_conf_user_story" id="menu_config_user_story_priority" action="action_user_story_priority" groups="user_story.group_user_story_manager,user_story.group_user_story_user"/>
   </data>
 </openerp>