[IMP] gamification: minor layout corrections (uppercase)

bzr revid: mat@openerp.com-20130218130656-emzxy335nr2irsl4
This commit is contained in:
Martin Trigaux
2013-02-18 14:06:56 +01:00
parent 34b154cba0
commit c1dc0578c1
4 changed files with 41 additions and 33 deletions
+16 -14
View File
@@ -80,10 +80,10 @@ class gamification_goal_type(osv.Model):
_order = "sequence"
_columns = {
'name': fields.char('Name', required=True),
'name': fields.char('Type Name', required=True),
'description': fields.text('Description'),
'computation_mode': fields.selection(GAMIFICATION_COMPUTATION_MODE,
string="Mode of computation",
string="Mode of Computation",
help="""How is computed the goal value :\n
- 'Sum' for the total of the values if the 'Evaluated field'\n
- 'Count' for the number of entries\n
@@ -93,16 +93,16 @@ class gamification_goal_type(osv.Model):
string='Object',
help='The object type for the field to evaluate' ),
'field': fields.many2one('ir.model.fields',
string='Evaluated field',
string='Evaluated Field',
help='The field containing the value to evaluate' ),
'field_date': fields.many2one('ir.model.fields',
string='Evaluated date field',
string='Evaluated Date Field',
help='The date to use for the time period evaluated'),
'domain': fields.char("Domain",
help="Technical filters rules to apply",
required=True), # how to apply it ?
'condition' : fields.selection(GAMIFICATION_VALIDATION_CONDITION,
string='Validation condition',
string='Validation Condition',
help='A goal is considered as completed when the current value is compared to the value to reach',
required=True),
'sequence' : fields.integer('Sequence',
@@ -140,14 +140,14 @@ class gamification_goal(osv.Model):
_columns = {
'type_id' : fields.many2one('gamification.goal.type',
string='Goal type',
string='Goal Type',
required=True),
'user_id' : fields.many2one('res.users', string='User', required=True),
'plan_id' : fields.many2one('gamification.goal.plan',
string='Goal plan'),
'start_date' : fields.date('Start date'),
'end_date' : fields.date('End date'), # no start and end = always active
'target_goal' : fields.float('To reach',
string='Goal Plan'),
'start_date' : fields.date('Start Date'),
'end_date' : fields.date('End Date'), # no start and end = always active
'target_goal' : fields.float('To Reach',
required=True,
track_visibility = 'always'), # no goal = global index
'current' : fields.float('Current',
@@ -193,7 +193,7 @@ class gamification_goal_plan(osv.Model):
_description = 'Gamification goal plan'
_columns = {
'name' : fields.char('Plan name', required=True),
'name' : fields.char('Plan Name', required=True),
'user_ids' : fields.many2many('res.users',
string='Users',
help="list of users to which the goal will be set"),
@@ -221,7 +221,7 @@ class gamification_goal_plan(osv.Model):
'report_message_group_id' : fields.many2one('mail.group',
string='Report to',
help='Group that will receive the report in addition to the user'),
'report_header' : fields.text('Report header'),
'report_header' : fields.text('Report Header'),
}
_defaults = {
@@ -271,8 +271,10 @@ class gamification_goal_planline(osv.Model):
'plan_id' : fields.many2one('gamification.goal.plan',
string='Plan'),
'type_id' : fields.many2one('gamification.goal.type',
string='Goal type'),
'target_goal' : fields.float('Target value to reach'),
string='Goal Type',
required=True),
'target_goal' : fields.float('Target Value to Reach',
required=True),
'sequence_type' : fields.related('type_id','sequence',
type='integer',
string='Sequence',
+7 -7
View File
@@ -8,10 +8,10 @@
</record>
<record id="goal_list_view" model="ir.ui.view">
<field name="name">Goal list</field>
<field name="name">Goal List</field>
<field name="model">gamification.goal</field>
<field name="arch" type="xml">
<tree string="Goal list" colors="red:state == 'failed';green:state == 'reached'">
<tree string="Goal List" colors="red:state == 'failed';green:state == 'reached'">
<field name="type_id"/>
<field name="user_id"/>
<field name="current"/>
@@ -25,14 +25,14 @@
</record>
<record id="goal_form_view" model="ir.ui.view">
<field name="name">Goal form</field>
<field name="name">Goal Form</field>
<field name="model">gamification.goal</field>
<field name="arch" type="xml">
<form string="Goal" version="7.0">
<header>
<button string="Mark as reached" type="object" name="action_reach" states="inprogress"/>
<button string="Mark as failed" type="object" name="action_fail" states="inprogress"/>
<button string="Cancel completion" type="object" name="action_cancel" states="failed,reached"/>
<button string="Mark as Reached" type="object" name="action_reach" states="inprogress"/>
<button string="Mark as Failed" type="object" name="action_fail" states="inprogress"/>
<button string="Cancel Completion" type="object" name="action_cancel" states="failed,reached"/>
<field name="state" widget="statusbar" statusbar_visible="inprogress" />
</header>
<sheet>
@@ -57,7 +57,7 @@
</record>
<record id="goal_calendar_view" model="ir.ui.view">
<field name="name">Goal calendar</field>
<field name="name">Goal Calendar</field>
<field name="model">gamification.goal</field>
<field name="arch" type="xml">
<calendar string="Goal"
+11 -8
View File
@@ -3,13 +3,13 @@
<data>
<record id="goal_plan_list_action" model="ir.actions.act_window">
<field name="name">Goal plans</field>
<field name="name">Goal Plans</field>
<field name="res_model">gamification.goal.plan</field>
<field name="view_mode">tree,form</field>
</record>
<record id="goal_plan_list_view" model="ir.ui.view">
<field name="name">Goal plans list</field>
<field name="name">Goal Plans List</field>
<field name="model">gamification.goal.plan</field>
<field name="arch" type="xml">
<tree string="Goal types" colors="blue:state == 'inprogress';grey:state == 'done'">
@@ -21,19 +21,22 @@
</record>
<record id="goal_plan_form_view" model="ir.ui.view">
<field name="name">Goal plan form</field>
<field name="name">Goal Plan Form</field>
<field name="model">gamification.goal.plan</field>
<field name="arch" type="xml">
<form string="Goal types" version="7.0">
<header>
<button string="Start plan" type="object" name="action_start" states="draft"/>
<button string="Close plan" type="object" name="action_close" states="inprogress"/>
<button string="Cancel plan" type="object" name="action_cancel" states="inprogress"/>
<button string="Start Plan" type="object" name="action_start" states="draft"/>
<button string="Close Plan" type="object" name="action_close" states="inprogress"/>
<button string="Cancel Plan" type="object" name="action_cancel" states="inprogress"/>
<field name="state" widget="statusbar"/>
</header>
<sheet>
<h1>
<field name="name" placeholder="Goal plan name"/>
<div class="oe_edit_only">
<label for="name"/>
</div>
<field name="name"/>
</h1>
<group>
<group colspan="4">
@@ -49,7 +52,7 @@
<notebook>
<page string="Goals">
<field name="planline_ids">
<tree string="planline list" version="7.0" editable="top" >
<tree string="Planline List" version="7.0" editable="bottom" >
<field name="type_id"/>
<field name="target_goal"/>
</tree>
+7 -4
View File
@@ -3,13 +3,13 @@
<data>
<record id="goal_type_list_action" model="ir.actions.act_window">
<field name="name">Goal types</field>
<field name="name">Goal Types</field>
<field name="res_model">gamification.goal.type</field>
<field name="view_mode">tree,form</field>
</record>
<record id="goal_type_list_view" model="ir.ui.view">
<field name="name">Goal types list</field>
<field name="name">Goal Types List</field>
<field name="model">gamification.goal.type</field>
<field name="arch" type="xml">
<tree string="Goal types">
@@ -24,13 +24,16 @@
<record id="goal_type_form_view" model="ir.ui.view">
<field name="name">Goal types form</field>
<field name="name">Goal Types Form</field>
<field name="model">gamification.goal.type</field>
<field name="arch" type="xml">
<form string="Goal types" version="7.0">
<sheet>
<h1>
<field name="name" placeholder="Goal type name"/>
<div class="oe_edit_only">
<label for="name"/>
</div>
<field name="name"/>
</h1>
<group>
<group string="General">