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

[IMP] display goals lower than

Browse Source 
bzr revid: mat@openerp.com-20130411101543-wal4yed64rynchfn
This commit is contained in:
Martin Trigaux
2013-04-11 12:15:43 +02:00
parent e68c4b5e23
commit cff925cf3e
3 changed files with 33 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/gamification/badge_view.xml
+1 -1
View File
@@ -177,7 +177,7 @@
<t t-if="record.comment.raw_value">
<p><em><field name="comment"/></em></p>
</t>
<p>Sent by <a type="open"><field name="create_uid" /></a> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></p>
<p>Granted by <a type="open"><field name="create_uid" /></a> the <t t-esc="record.create_date.raw_value.toString(Date.CultureInfo.formatPatterns.shortDate)" /></p>
</div>
</div>
</t>
addons/gamification/goal_view.xml
+21 -22
View File
@@ -142,38 +142,37 @@
<field name="start_date"/>
<field name="end_date"/>
<templates>
<t t-name="kanban-tooltip">
<field name="type_description"/>
</t>
<t t-name="kanban-box">
<div t-attf-class="oe_kanban_card oe_gamification_goal oe_kanban_goal">
<div class="oe_kanban_content">
<p><h4 class="oe_goal_name" tooltip="kanban-tooltip"><field name="type_id" /></h4></p>
<div class="oe_kanban_left">
<img t-att-src="kanban_image('res.users', 'image_small', record.user_id.raw_value)" t-att-title="record.user_id.value" width="24" height="24" />
</div>
<div>
<h4 class="oe_goal_name"><field name="type_id"/></h4>
</div>
<field name="user_id" />
<div class="oe_goal_state_block">
<t t-if="!record.type_ponctual.value">
<div class="oe_goal_gauge"></div>
</t>
<t t-if="record.type_ponctual.value">
<p class="oe_e">
<t t-if="record.state.raw_value=='reached'">
W
</t>
<t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">
N
</t>
<t t-if="record.state.raw_value=='failed'">
X
</t>
</p>
<div class="oe_goal_state oe_e"><t t-if="record.state.raw_value=='reached'">W</t>
<t t-if="record.state.raw_value=='inprogress' || record.state.raw_value=='inprogress_update'">N</t>
<t t-if="record.state.raw_value=='failed'">X</t>
</div>
</t>
<t t-if="!record.type_ponctual.value">
<t t-if="record.type_condition.raw_value =='higher'">
<div class="oe_goal_gauge"></div>
</t>
<t t-if="record.type_condition.raw_value != 'higher'">
<div class="oe_goal_state">
<t t-esc="record.current.raw_value" /> → <t t-esc="record.target_goal.raw_value" />
</div>
<em>reached when lower than</em>
</t>
</t>
</div>
<p>
<t t-if="record.type_description.value">
<em><field name="type_description"/></em>
</t>
</p>
<p>
<t t-if="record.start_date.value">
From <t t-esc="record.start_date.value" />
addons/gamification/static/src/css/goal.css
+11 -8
View File
@@ -1,13 +1,9 @@
/* Kanban views */
.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal,
.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_badge {
width: 220px;
width: 200px;
min-height: 200px;
}
.openerp .oe_kanban_view .oe_kanban_card.oe_kanban_goal p {
text-align: center;
}
.oe_kanban_badge_avatars {
margin-top: 8px;
}
@@ -25,9 +21,16 @@
margin: auto;
margin-bottom: -20px;
}
.oe_kanban_goal .oe_goal_state_block p {
line-height: 70px;
font-size: 3em;
.oe_kanban_goal .oe_goal_state_block,p {
text-align: center;
}
.oe_kanban_goal .oe_goal_state_block .oe_goal_state {
font-size: 2.5em;
font-weight: bold;
padding-top: 30px;
}
.oe_kanban_goal .oe_goal_state_block .oe_goal_state.oe_e{
font-size: 7em;
}
.openerp .oe_kanban_view .oe_kanban_content .oe_goal_gauge:first-child {
margin: auto; /* avoid margin-right: 16px; */