[IMP] remove expected new employee from kanban and improved view

bzr revid: tpa@tinyerp.com-20130529061858-3ncrwczio8uwmzvq
This commit is contained in:
Turkesh Patel (Open ERP) 2013-05-29 11:48:58 +05:30
parent 4d74d76ff2
commit c2e75a7a65
5 changed files with 10 additions and 14 deletions

View File

@ -385,7 +385,7 @@
<search string="Jobs">
<field name="name" string="Job"/>
<filter icon="terp-camera_test" domain="[('state','=','open')]" string="In Position" help="In Position"/>
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment"/>
<filter icon="terp-personal+" domain="[('state','=','recruit')]" string="In Recruitment" help="In Recruitment" name="in_recruitment"/>
<field name="department_id"/>
<group expand="0" string="Group By...">
<filter string="Department" icon="terp-personal+" domain="[]" context="{'group_by':'department_id'}"/>

View File

@ -378,20 +378,14 @@
<img t-att-src="kanban_image('hr.employee', 'image', record.manager_id.raw_value, {'preview_image': 'image_small'})" t-att-title="record.manager_id.value.name" class="oe_kanban_avatar"/>
<t t-if="record.state.raw_value == 'recruit'">
<div class="oe_applications">
<a name="%(hr_job_applications)d" type="action" >
<div t-if="record.application_count.value gt 1"><t t-esc="record.application_count.value"/> Applications</div>
<div t-if="record.application_count.value lt 2"><t t-esc="record.application_count.value"/> Application</div>
</a>
</div>
<div class="oe_new_recruitment">
<div t-if="(record.no_of_recruitment.raw_value - record.no_of_hired_employee.raw_value) gt 1"><t t-esc="record.no_of_recruitment.raw_value - record.no_of_hired_employee.raw_value"/> Expected New Employees</div>
<div t-if="(record.no_of_recruitment.raw_value - record.no_of_hired_employee.raw_value) lt 2"><t t-esc="record.no_of_recruitment.raw_value - record.no_of_hired_employee.raw_value"/> Expected New Employee</div>
<a name="%(hr_job_applications)d" type="action" t-if="record.application_count.value gt 1"><t t-esc="record.application_count.value"/> Applications</a>
<a name="%(hr_job_applications)d" type="action" t-if="record.application_count.value lt 2"><t t-esc="record.application_count.value"/> Application</a>
</div>
<field state="recruit" name="no_of_recruitment" widget="gage" style="width:200px; height:130px;" options="{'min_field': 'no_of_hired_employee','max_field': 'no_of_recruitment', 'label_field': 'no_of_hired_employee', 'action_change': 'action_hired_employee'}">Forecast</field>
</t>
<t t-if="record.state.raw_value == 'open'">
<div class="oe_start_recruitment">
<p>To start the recruitment,<b>click here</b></p>
<p>To start the recruitment, <b>click here</b></p>
<img src="/hr_recruitment/static/src/img/down1.png"/>
</div>
</t>
@ -415,6 +409,7 @@
<field name="res_model">hr.job</field>
<field name="view_type">form</field>
<field name="view_mode">kanban,tree,form</field>
<field name="context">{'search_default_in_recruitment': 1}</field>
</record>
<!-- Stage Tree View -->

View File

@ -27,7 +27,7 @@
</div>
<xpath expr="//div/div[@name='hr_recruitment']" position="after">
<div attrs="{'invisible': ['|',('module_hr_recruitment','=',False),('alias_domain', '=', False)]}">
<label string="Alias for Jobs"/>
<label string="Your job email addess"/>
<field name="alias_prefix" class="oe_inline" attrs="{'required': [('alias_domain', '!=', False)]}"/>
@
<field name="alias_domain" class="oe_inline" readonly="1"/>

View File

@ -22,9 +22,10 @@
right: 10px;
}
.openerp div.oe_applications {
margin-top: 28px;
margin-top: 35px;
font-size: 16px;
}
.openerp .oe_applications > a > div:hover {
.openerp .oe_applications > a:hover {
text-decoration: underline
}
.openerp .oe_name {

View File

@ -9,7 +9,7 @@ openerp.hr_recruitment = function (openerp) {
var value = parent.values.no_of_hired_employee.value;
var flag_open = false;
this.$el.empty()
.attr('style', this.$node.attr('style') + ';float: right; margin-top: -110px; margin-right: -30px;')
.attr('style', this.$node.attr('style') + ';float: right; margin-top: -105px; margin-right: -30px;')
.attr('id', unique_id);
this.gage = new JustGage({
id: unique_id,