From 50082c1160a852315e14e07c097560b55f321c39 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Thu, 9 May 2013 14:52:52 +0530
Subject: [PATCH 1/3] [IMP]Improve code for interview link and add field
 no_of_application in job position form

bzr revid: vja@tinyerp.com-20130509092252-e26nsd25vwugrtrw
---
 addons/hr/hr.py                               |  6 +++++
 addons/hr_recruitment/hr_recruitment.py       | 25 -------------------
 addons/hr_recruitment/hr_recruitment_view.xml | 25 ++++++++++++++++---
 .../static/src/css/job_position.css           |  6 +++++
 4 files changed, 33 insertions(+), 29 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 8491ca39312..8e899186cfa 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -74,11 +74,14 @@ class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
+        applicant_obj = self.pool.get('hr.applicant')
         for job in self.browse(cr, uid, ids, context=context):
             nb_employees = len(job.employee_ids or [])
+            job_ids = len(applicant_obj.search(cr, uid, [('job_id', '=', job.id)], context=context))
             res[job.id] = {
                 'no_of_employee': nb_employees,
                 'expected_employees': nb_employees + job.no_of_recruitment,
+                'no_of_application':job_ids
             }
         return res
 
@@ -105,6 +108,9 @@ class hr_job(osv.osv):
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
+        'no_of_application': fields.function(_no_of_employee, type="integer" ,string='Total Number of Application',
+            help='Expected number of employees for this job position after new recruitment.',
+            multi='no_of_employee'),
         'no_of_employee': fields.function(_no_of_employee, string="Current Number of Employees",
             help='Number of employees currently occupying this job position.',
             store = {
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 6ac8d7cf4dd..8098e4b1ecb 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -492,30 +492,6 @@ class hr_job(osv.osv):
     _name = "hr.job"
     _inherits = {'mail.alias': 'alias_id'}
 
-    def _count_priority(self, cr, uid, ids, name, args, context=None):
-        """Applicant, priority count like number of star 3,2,1(star rating)
-        """
-        applicant_obj = self.pool.get('hr.applicant')
-        res = {}
-        for position in self.browse(cr, uid, ids, context=context):
-            res[position.id] = {}
-            priority1 = 0
-            priority2 = 0
-            priority3 = 0
-            rate_ids = applicant_obj.search(cr, uid, [('job_id', '=', position.id)], context=context)
-            for applicant in applicant_obj.browse(cr, uid, rate_ids, context=context):
-                if applicant.job_id.id == position.id:
-                    if applicant.priority == '3':
-                        priority3 += 1
-                    elif applicant.priority == '2':
-                        priority2 += 1
-                    elif applicant.priority == '1':
-                        priority1 += 1
-                    else:
-                        pass
-            res[position.id] = {'priority1': priority1, 'priority2': priority2, 'priority3': priority3, 'total_application':len(rate_ids)}
-        return res
-
     def _get_department_mgr(self, cr, uid, ids, name, args, context=None):
         """Get manager image for specific job position.
         """
@@ -535,7 +511,6 @@ class hr_job(osv.osv):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
-        'priority_count': fields.function(_count_priority, string='Total Priority Employees', type="char"),
         'manager_id': fields.function(_get_department_mgr, string='Department Manager', type="char"),#manager image in kanban
     }
     _defaults = {
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 96ddd2e9e4e..c20fabea9d8 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -303,10 +303,12 @@
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="expected_employees" version="7.0" position="after">
+                <label for="no_of_application" groups="base.group_user"/>
+                <div><field name="no_of_application"/><button class="oe_inline oe_link oe_app" string="Application" name="%(hr_job_applications)d" type="action"/></div>
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
                     <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
-                    <button class="oe_inline"
+                    <button class="oe_inline oe_link"
                         string="Interview"
                         name="action_print_survey" type="object"
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
@@ -344,7 +346,7 @@
                     <field name="department_id"/>
                     <field name="no_of_recruitment"/>
                     <field name="color"/>
-                    <field name="priority_count"/>
+                    <field name="no_of_application"/>
                     <field name="manager_id"/>
                     <field name="message_summary"/>
                     <templates>
@@ -359,6 +361,7 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content" >
+                                  
                                   <a class="oe_kanban_action_a" name="%(hr_job_applications)d" type="action" >
                                     <h3 class="oe_job oe_kanban_ellipsis"><field name="name"/></h3>
                                     <div class="oe_job oe_kanban_ellipsis"><field name="department_id"/></div>
@@ -366,8 +369,8 @@
                                     <div class="oe_name"><t t-esc="record.manager_id.value.name"/></div>
                                     <div style="margin-top:25px;margin-bottom:7px;"><t t-esc="Math.round(record.no_of_recruitment.raw_value)"/> Expected in Recruitment</div>
                                     <div class="oe_application">
-                                       <span t-if="widget.values.priority_count.value.total_application gt 1"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Applications</span>
-                                       <span t-if="widget.values.priority_count.value.total_application lt 2"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Application</span>
+                                       <span t-if="widget.values.no_of_application.value gt 1"><t t-esc="widget.values.no_of_application.value"/> Applications</span>
+                                       <span t-if="widget.values.no_of_application.value lt 2"><t t-esc="widget.values.no_of_application.value"/> Application</span>
                                     </div>
                                   </a>
                                   <div class="oe_kanban_footer_left oe_job_message"><t t-raw="record.message_summary.raw_value"/></div>
@@ -385,6 +388,20 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
+            <field name="help" type="html">
+              <p class="oe_view_nocontent_create">
+                Click to define a new job position.
+              </p><p>
+                Job Positions are used to define jobs and their requirements.
+                You can keep track of the number of employees you have per job
+                position and follow the evolution according to what you planned
+                for the future.
+              </p><p>
+                You can attach a survey to a job position. It will be used in
+                the recruitment process to evaluate the applicants for this job
+                position.
+              </p>
+            </field>
         </record>
 
     <!-- Stage Tree View -->
diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css
index 0f30df708dd..9019a555ca8 100644
--- a/addons/hr_recruitment/static/src/css/job_position.css
+++ b/addons/hr_recruitment/static/src/css/job_position.css
@@ -32,3 +32,9 @@
     font-size: 11px;
     color: gray;
 }
+.openerp .oe_app{
+    position: absolute;
+    margin-top: -18px !important;
+    margin-left: 16px !important;
+}
+

From 9bd2299a6999e63e518d3bafbcfdfee08aaa6d44 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Fri, 17 May 2013 11:14:03 +0530
Subject: [PATCH 2/3] [REV]Revert last commmit

bzr revid: vja@tinyerp.com-20130517054403-kv361vjdn620egns
---
 addons/hr/hr.py                               |  6 -----
 addons/hr_recruitment/hr_recruitment.py       | 25 +++++++++++++++++++
 addons/hr_recruitment/hr_recruitment_view.xml | 25 +++----------------
 .../static/src/css/job_position.css           |  6 -----
 4 files changed, 29 insertions(+), 33 deletions(-)

diff --git a/addons/hr/hr.py b/addons/hr/hr.py
index 8e899186cfa..8491ca39312 100644
--- a/addons/hr/hr.py
+++ b/addons/hr/hr.py
@@ -74,14 +74,11 @@ class hr_job(osv.osv):
 
     def _no_of_employee(self, cr, uid, ids, name, args, context=None):
         res = {}
-        applicant_obj = self.pool.get('hr.applicant')
         for job in self.browse(cr, uid, ids, context=context):
             nb_employees = len(job.employee_ids or [])
-            job_ids = len(applicant_obj.search(cr, uid, [('job_id', '=', job.id)], context=context))
             res[job.id] = {
                 'no_of_employee': nb_employees,
                 'expected_employees': nb_employees + job.no_of_recruitment,
-                'no_of_application':job_ids
             }
         return res
 
@@ -108,9 +105,6 @@ class hr_job(osv.osv):
                 'hr.employee': (_get_job_position, ['job_id'], 10),
             },
             multi='no_of_employee'),
-        'no_of_application': fields.function(_no_of_employee, type="integer" ,string='Total Number of Application',
-            help='Expected number of employees for this job position after new recruitment.',
-            multi='no_of_employee'),
         'no_of_employee': fields.function(_no_of_employee, string="Current Number of Employees",
             help='Number of employees currently occupying this job position.',
             store = {
diff --git a/addons/hr_recruitment/hr_recruitment.py b/addons/hr_recruitment/hr_recruitment.py
index 8098e4b1ecb..6ac8d7cf4dd 100644
--- a/addons/hr_recruitment/hr_recruitment.py
+++ b/addons/hr_recruitment/hr_recruitment.py
@@ -492,6 +492,30 @@ class hr_job(osv.osv):
     _name = "hr.job"
     _inherits = {'mail.alias': 'alias_id'}
 
+    def _count_priority(self, cr, uid, ids, name, args, context=None):
+        """Applicant, priority count like number of star 3,2,1(star rating)
+        """
+        applicant_obj = self.pool.get('hr.applicant')
+        res = {}
+        for position in self.browse(cr, uid, ids, context=context):
+            res[position.id] = {}
+            priority1 = 0
+            priority2 = 0
+            priority3 = 0
+            rate_ids = applicant_obj.search(cr, uid, [('job_id', '=', position.id)], context=context)
+            for applicant in applicant_obj.browse(cr, uid, rate_ids, context=context):
+                if applicant.job_id.id == position.id:
+                    if applicant.priority == '3':
+                        priority3 += 1
+                    elif applicant.priority == '2':
+                        priority2 += 1
+                    elif applicant.priority == '1':
+                        priority1 += 1
+                    else:
+                        pass
+            res[position.id] = {'priority1': priority1, 'priority2': priority2, 'priority3': priority3, 'total_application':len(rate_ids)}
+        return res
+
     def _get_department_mgr(self, cr, uid, ids, name, args, context=None):
         """Get manager image for specific job position.
         """
@@ -511,6 +535,7 @@ class hr_job(osv.osv):
         'alias_id': fields.many2one('mail.alias', 'Alias', ondelete="cascade", required=True,
                                     help="Email alias for this job position. New emails will automatically "
                                          "create new applicants for this job position."),
+        'priority_count': fields.function(_count_priority, string='Total Priority Employees', type="char"),
         'manager_id': fields.function(_get_department_mgr, string='Department Manager', type="char"),#manager image in kanban
     }
     _defaults = {
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index c20fabea9d8..96ddd2e9e4e 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -303,12 +303,10 @@
         <field name="inherit_id" ref="hr.view_hr_job_form"/>
         <field name="arch" type="xml">
             <field name="expected_employees" version="7.0" position="after">
-                <label for="no_of_application" groups="base.group_user"/>
-                <div><field name="no_of_application"/><button class="oe_inline oe_link oe_app" string="Application" name="%(hr_job_applications)d" type="action"/></div>
                 <label for="survey_id" groups="base.group_user"/>
                 <div groups="base.group_user">
                     <field name="survey_id" class="oe_inline" domain="[('type','=','Human Resources')]"/>
-                    <button class="oe_inline oe_link"
+                    <button class="oe_inline"
                         string="Interview"
                         name="action_print_survey" type="object"
                         attrs="{'invisible':[('survey_id','=',False)]}"/>
@@ -346,7 +344,7 @@
                     <field name="department_id"/>
                     <field name="no_of_recruitment"/>
                     <field name="color"/>
-                    <field name="no_of_application"/>
+                    <field name="priority_count"/>
                     <field name="manager_id"/>
                     <field name="message_summary"/>
                     <templates>
@@ -361,7 +359,6 @@
                                     </ul>
                                 </div>
                                 <div class="oe_kanban_content" >
-                                  
                                   <a class="oe_kanban_action_a" name="%(hr_job_applications)d" type="action" >
                                     <h3 class="oe_job oe_kanban_ellipsis"><field name="name"/></h3>
                                     <div class="oe_job oe_kanban_ellipsis"><field name="department_id"/></div>
@@ -369,8 +366,8 @@
                                     <div class="oe_name"><t t-esc="record.manager_id.value.name"/></div>
                                     <div style="margin-top:25px;margin-bottom:7px;"><t t-esc="Math.round(record.no_of_recruitment.raw_value)"/> Expected in Recruitment</div>
                                     <div class="oe_application">
-                                       <span t-if="widget.values.no_of_application.value gt 1"><t t-esc="widget.values.no_of_application.value"/> Applications</span>
-                                       <span t-if="widget.values.no_of_application.value lt 2"><t t-esc="widget.values.no_of_application.value"/> Application</span>
+                                       <span t-if="widget.values.priority_count.value.total_application gt 1"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Applications</span>
+                                       <span t-if="widget.values.priority_count.value.total_application lt 2"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Application</span>
                                     </div>
                                   </a>
                                   <div class="oe_kanban_footer_left oe_job_message"><t t-raw="record.message_summary.raw_value"/></div>
@@ -388,20 +385,6 @@
             <field name="res_model">hr.job</field>
             <field name="view_type">form</field>
             <field name="view_mode">kanban,tree,form</field>
-            <field name="help" type="html">
-              <p class="oe_view_nocontent_create">
-                Click to define a new job position.
-              </p><p>
-                Job Positions are used to define jobs and their requirements.
-                You can keep track of the number of employees you have per job
-                position and follow the evolution according to what you planned
-                for the future.
-              </p><p>
-                You can attach a survey to a job position. It will be used in
-                the recruitment process to evaluate the applicants for this job
-                position.
-              </p>
-            </field>
         </record>
 
     <!-- Stage Tree View -->
diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css
index 9019a555ca8..0f30df708dd 100644
--- a/addons/hr_recruitment/static/src/css/job_position.css
+++ b/addons/hr_recruitment/static/src/css/job_position.css
@@ -32,9 +32,3 @@
     font-size: 11px;
     color: gray;
 }
-.openerp .oe_app{
-    position: absolute;
-    margin-top: -18px !important;
-    margin-left: 16px !important;
-}
-

From a231356ba33cbad366916ad8455244fb66a8fb90 Mon Sep 17 00:00:00 2001
From: "Vishmita Jadeja (openerp)" <vja@tinyerp.com>
Date: Fri, 17 May 2013 11:37:57 +0530
Subject: [PATCH 3/3] [IMP]usability improvements

bzr revid: vja@tinyerp.com-20130517060757-kispsuailcf7qx6h
---
 addons/hr_recruitment/hr_recruitment_view.xml     | 15 ++++++++++-----
 .../static/src/css/job_position.css               |  4 ++++
 2 files changed, 14 insertions(+), 5 deletions(-)

diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index 96ddd2e9e4e..95287b78e48 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -364,13 +364,18 @@
                                     <div class="oe_job oe_kanban_ellipsis"><field name="department_id"/></div>
                                     <img t-if="record.department_id.raw_value" t-att-src="kanban_image('hr.employee', 'image_small', widget.values.manager_id.value.id)" t-att-title="record.manager_id.value.name" class="oe_kanban_avatar"/>
                                     <div class="oe_name"><t t-esc="record.manager_id.value.name"/></div>
-                                    <div style="margin-top:25px;margin-bottom:7px;"><t t-esc="Math.round(record.no_of_recruitment.raw_value)"/> Expected in Recruitment</div>
-                                    <div class="oe_application">
-                                       <span t-if="widget.values.priority_count.value.total_application gt 1"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Applications</span>
-                                       <span t-if="widget.values.priority_count.value.total_application lt 2"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Application</span>
-                                    </div>
+                                    <t t-if="!widget.values.no_of_recruitment.value lt 1">
+                                      <div class="oe_application">
+                                        <span t-if="widget.values.priority_count.value.total_application gt 1"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Applications</span>
+                                        <span t-if="widget.values.priority_count.value.total_application lt 2"><t t-esc="Math.round(widget.values.priority_count.value.total_application)"/> Application</span>
+                                      </div>
+                                      <div style="margin-top: 6px;color: #4c4c4c;"><t t-esc="Math.round(record.no_of_recruitment.raw_value)"/> Expected in Recruitment</div>
+                                    </t>
                                   </a>
                                   <div class="oe_kanban_footer_left oe_job_message"><t t-raw="record.message_summary.raw_value"/></div>
+                                  <t t-if="widget.values.no_of_recruitment.value lt 1">
+                                        <div style="padding-top: 10px;"><p>To start a recruitment phase for this job position,<b>click here</b></p><img src="/hr_recruitment/static/src/img/down1.png" style="margin-top: -24px; width: 22px;height: 22px;float: right;padding-right: 88px;"/> </div>
+                                  </t>
                                 </div>
                             </div>
                         </t>
diff --git a/addons/hr_recruitment/static/src/css/job_position.css b/addons/hr_recruitment/static/src/css/job_position.css
index 0f30df708dd..04f288e53a7 100644
--- a/addons/hr_recruitment/static/src/css/job_position.css
+++ b/addons/hr_recruitment/static/src/css/job_position.css
@@ -25,6 +25,10 @@
     margin: 4px 0;
     text-decoration: underline
 }
+.openerp div.oe_application {
+    margin-top: 24px;
+}
+
 .openerp .oe_name {
     margin-left: 44px;
     margin-top: -18px;