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

[MERGE]

Browse Source 
bzr revid: sgo@tinyerp.com-20120405103854-1ql8gu3a8hniy6uk
This commit is contained in:
Sanjay Gohel (Open ERP)
2012-04-05 16:08:54 +05:30
parent d3c4b80fb8 e699f7d3b7
commit bb13fe9a10
3 changed files with 35 additions and 38 deletions
Download Patch File Download Diff File Expand all files Collapse all files
addons/project/project_view.xml
+26 -28
View File
@@ -200,36 +200,34 @@
</t>
</a>
</h4>
<button class="test" >
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
<th align="left">Deadline</th>
<td align="left">
<t t-esc="record.date.raw_value.toString('MMMM')"/>
<t t-esc="record.date.raw_value.getDate()"/>,
<t t-esc="record.date.raw_value.getFullYear()"/>
</td>
</tr>
<tr>
<th align="left" width="70px">Progress</th>
<td align="left">
<t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
</td>
</tr>
</table>
<t t-if="record.members.raw_value.length > 7">
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
<button class="click_button" type="object">
<table class="project_fields">
<tr id="deadline" t-if="record.date.raw_value">
<th align="left">Deadline</th>
<td align="left">
<t t-esc="record.date.raw_value.toString('MMMM')"/>
<t t-esc="record.date.raw_value.getDate()"/>,
<t t-esc="record.date.raw_value.getFullYear()"/>
</td>
</tr>
<tr>
<th align="left" width="70px">Progress</th>
<td align="left">
<t t-esc="Math.round(record.effective_hours.raw_value/24)"/>/<t t-esc="Math.round(record.total_hours.raw_value/24)"/> days
</td>
</tr>
</table>
<t t-if="record.members.raw_value.length > 7">
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
</t>
<t t-if="record.members.raw_value.length &lt;= 7">
<br/><br/>
<img t-att-src="kanban_image('res.users', 'avatar', record.user_id.raw_value[0])" t-att-title="record.user_id.value" t-att-id="record.user_id.raw_value[0]" class="project_avatar"/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
<t t-if="record.members.raw_value.length &lt;= 7">
<br/><br/>
<t t-foreach="record.members.raw_value" t-as="member">
<img t-att-src="kanban_image('res.users', 'avatar', member)" t-att-title="member" t-att-id="member" class="project_avatar"/>
</t>
</t>
</t>
</button>
</li>
</div>
addons/project/static/src/css/project.css
+8 -7
View File
@@ -43,7 +43,7 @@ table {
color: #4c4c4c; }
.project_vignettes > li {
height: 160px;
height: 170px;
width: 250px;
padding: 8px;
margin: 4px; }
@@ -77,15 +77,16 @@ table {
font-size: 21px;
font-weight: 300 !important; }
.test {
.click_button {
display: inline-block;
background-color: transparent;
min-height: 120px;
min-width: 250px;
min-height: 140px;
min-width: 265px;
border: hidden;
text-align: left;
color: #8A89BA;
margin-left: -6px !important;
margin-top: -3px !important;
text-align: left;
font-size: 11px;
}
.dropdown-menu {
addons/project/static/src/js/project.js
+1 -3
View File
@@ -9,9 +9,6 @@ openerp.project = function(openerp) {
}).mouseout(function() {
return $(this).find('.oe_project_kanban_action').hide();
});
$('.test').click(function(){
$('#open_tasks').click()
});
_.each($('.oe_project_kanban_vignette'),function(record){
_.each(record.getElementsByTagName('img'),function(img){
var domain = [['id','=',img.getAttribute("id")]];
@@ -22,6 +19,7 @@ openerp.project = function(openerp) {
});
});
$('.click_button').attr('data-name','open_tasks');
}
});
}