From a674b47980130b480f8e9bff0c1d5b0c6ac9be79 Mon Sep 17 00:00:00 2001
From: "Richard Mathot (OpenERP)" <rim@openerp.com>
Date: Wed, 19 Mar 2014 14:52:24 +0100
Subject: [PATCH] [FIX] Views and actions for hr_evaluation

bzr revid: rim@openerp.com-20140319135224-qxeth056mwkwciue
---
 addons/hr_evaluation/hr_evaluation.py         | 39 +++++++++--------
 addons/hr_evaluation/hr_evaluation_view.xml   | 43 +++----------------
 addons/hr_recruitment/hr_recruitment_view.xml |  8 ++--
 3 files changed, 32 insertions(+), 58 deletions(-)

diff --git a/addons/hr_evaluation/hr_evaluation.py b/addons/hr_evaluation/hr_evaluation.py
index 4c136f49793..7d9f45f3585 100644
--- a/addons/hr_evaluation/hr_evaluation.py
+++ b/addons/hr_evaluation/hr_evaluation.py
@@ -285,7 +285,6 @@ class hr_evaluation_interview(osv.Model):
                                    ('done', "Done"),
                                    ('cancel', "Cancelled")],
                                   string="State", required=True),
-        # fields from request_id
         'survey_id': fields.related('phase_id', 'survey_id', string="Appraisal Form", type="many2one", relation="survey.survey"),
         'deadline': fields.related('request_id', 'deadline', type="datetime", string="Deadline"),
     }
@@ -326,7 +325,10 @@ class hr_evaluation_interview(osv.Model):
         return res
 
     def survey_req_waiting_answer(self, cr, uid, ids, context=None):
-        self.write(cr, uid, ids, {'state': 'waiting_answer'}, context=context)
+        request_obj = self.pool.get('survey.user_input')
+        for interview in self.browse(cr, uid, ids, context=context):
+            request_obj.action_survey_resent(cr, uid, [interview.id], context=context)
+            self.write(cr, uid, interview.id, {'state': 'waiting_answer'}, context=context)
         return True
 
     def survey_req_done(self, cr, uid, ids, context=None):
@@ -352,20 +354,21 @@ class hr_evaluation_interview(osv.Model):
         return True
 
     def action_print_survey(self, cr, uid, ids, context=None):
-        """
-        If response is available then print this response otherwise print survey form(print template of the survey).
+        """ If response is available then print this response otherwise print survey form (print template of the survey) """
+        context = context if context else {}
+        interview = self.browse(cr, uid, ids, context=context)[0]
+        survey_obj = self.pool.get('survey.survey')
+        response_obj = self.pool.get('survey.user_input')
+        response = response_obj.browse(cr, uid, interview.request_id.id, context=context)
+        context.update({'survey_token': response.token})
+        return survey_obj.action_print_survey(cr, uid, [interview.survey_id.id], context=context)
 
-        @param self: The object pointer
-        @param cr: the current row, from the database cursor,
-        @param uid: the current user’s ID for security checks,
-        @param ids: List of Survey IDs
-        @param context: A standard dictionary for contextual values
-        @return: Dictionary value for print survey form.
-        """
-        if context is None:
-            context = {}
-        record = self.browse(cr, uid, ids, context=context)
-        record = record and record[0]
-        context.update({'survey_id': record.survey_id.id, 'response_id': [record.response.id], 'response_no': 0})
-        value = self.pool.get("survey").action_print_survey(cr, uid, ids, context=context)
-        return value
+    def action_start_survey(self, cr, uid, ids, context=None):
+        context = context if context else {}
+        interview = self.browse(cr, uid, ids, context=context)[0]
+        survey_obj = self.pool.get('survey.survey')
+        response_obj = self.pool.get('survey.user_input')
+        # grab the token of the response and start surveying
+        response = response_obj.browse(cr, uid, interview.request_id.id, context=context)
+        context.update({'survey_token': response.token})
+        return survey_obj.action_start_survey(cr, uid, [interview.survey_id.id], context=context)
diff --git a/addons/hr_evaluation/hr_evaluation_view.xml b/addons/hr_evaluation/hr_evaluation_view.xml
index 73347f0fbe4..8f3998eeb42 100644
--- a/addons/hr_evaluation/hr_evaluation_view.xml
+++ b/addons/hr_evaluation/hr_evaluation_view.xml
@@ -180,31 +180,7 @@
                         </group>
                     </group>
                     <group string="Appraisal Forms" attrs="{'invisible':[('state','=','draft')]}">
-                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}">
-                            <form string="Interview Appraisal" version="7.0">
-                                <div class="oe_right oe_button_box">
-                                    <button string="Answer Survey" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                                    <button string="Print Interview" states="done" icon="gtk-print" context="{'survey_id': survey_id, 'response_id' : [response], 'response_no':0,}" attrs="{'readonly':[('response_id','=',False)]}" />
-                                </div>
-                                <group>
-                                    <group>
-                                        <field name="survey_id" domain="[('res_model','=','hr_evaluation')]"/>
-                                        <field name="user_to_review_id"/>
-                                        <field name="user_id" string="Interviewer" context="{'default_groups_ref': ['base.group_user', 'base.group_partner_manager', 'base.group_hr_manager']}"/>
-                                    </group>
-                                    <group>
-                                        <field name="deadline"/>
-                                        <field name="request_id" readonly="1"/>
-                                    </group>
-                                </group>
-                                <group col="4" string="Status" invisible="1">
-                                     <field name="state"/>
-                                     <div>
-                                         <button string="Done" name="survey_req_done" states="waiting_answer" type="object" icon="gtk-jump-to" />
-                                     </div>
-                                </group>
-                            </form>
-                        </field>
+                        <field nolabel="1" name="survey_request_ids" attrs="{'readonly': [('state', '=', 'done')]}" />
                     </group>
                     <group string="Internal Notes" attrs="{'invisible':[('state','=','draft')]}">
                         <field nolabel="1" name="note_action"
@@ -288,15 +264,10 @@
                     <header>
                         <button string="Cancel Survey" name="survey_req_cancel" type="object"
                             states="draft,waiting_answer" class="oe_left"/>
-                        <button string="Print Survey" name="action_print_survey"  type="object"
-                            states="draft" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}"
-                            attrs="{'readonly':[('survey_id','=',False)]}" class="oe_highlight"/>
+                        <button string="Print Survey" name="action_print_survey" type="object" states='waiting_answer,done' attrs="{'readonly':[('survey_id','=',False)]}"/>
                         <button string="Send Request" name="survey_req_waiting_answer" type="object"
                             states="draft" class="oe_highlight"/>
-                        <button string="Answer Survey" name="#" type="action"
-                            states="waiting_answer" class="oe_highlight"
-                            context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response,'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}"
-                            attrs="{'readonly':[('survey_id','=',False)]}"/>
+                        <button string="Answer Survey" class="oe_highlight" name="action_start_survey" type="object" states='waiting_answer' attrs="{'readonly':[('request_id','=',False)]}"/>
                         <button string="Done" name="survey_req_done" type="object"
                             states="waiting_answer"/>
                         <field name="state" widget="statusbar" statusbar_visible="waiting_answer,done"/>
@@ -305,7 +276,7 @@
                         <div class="oe_right oe_button_box" name="button_box">
                             <button string="Send Reminder Email" name="%(mail.action_email_compose_message_wizard)d" type="action"
                                 states="waiting_answer"
-                                context="{'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                                context="{'default_body': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
                                             'default_subject': 'Reminder to fill up Survey' }"/>
                         </div>
                         <group>
@@ -338,8 +309,8 @@
                     <field name="user_id" string="Interviewer"/>
                     <field name="user_to_review_id"/>
                     <field name="request_id" readonly="1" invisible="True"/>
-                    <button name="#" string="Answer Survey" type="action" states="waiting_answer" icon="gtk-execute" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0, 'active' : response, 'request' : True, 'object' : 'hr.evaluation.interview', 'cur_id' : active_id}" attrs="{'readonly':[('survey_id','=',False)]}"/>
-                    <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print" context="{'survey_id': survey_id, 'response_id': [response], 'response_no':0}" attrs="{'readonly':[('survey_id','=',False)]}"/>
+                    <button name="action_start_survey" string="Answer Survey" type="object" icon="gtk-execute"  attrs="{'readonly':[('request_id','=',False)]}"/>
+                    <button name="action_print_survey" string="Print Survey" type="object" icon="gtk-print"  attrs="{'readonly':[('survey_id','=',False)]}"/>
                     <button name="%(mail.action_email_compose_message_wizard)d" string="Send Reminder Email" icon="terp-mail-message-new" type="action" states="waiting_answer"/>
                     <field name="state"/>
                     <button string="Send Request" name="survey_req_waiting_answer" states="draft" type="object" icon="gtk-yes" />
@@ -426,7 +397,7 @@
         target="new" multi="True"
         key2="client_action_multi"
         context="{'default_composition_mode': 'mass_mail',
-                    'default_body_text': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
+                    'default_body': 'Hello,\n\nKindly post your response for the survey interview.\n\nThanks',
                     'default_subject': 'Reminder to fill up Survey'}"/>
 
     </data>
diff --git a/addons/hr_recruitment/hr_recruitment_view.xml b/addons/hr_recruitment/hr_recruitment_view.xml
index a5d5ddabb0a..53e35ea58d1 100644
--- a/addons/hr_recruitment/hr_recruitment_view.xml
+++ b/addons/hr_recruitment/hr_recruitment_view.xml
@@ -93,7 +93,7 @@
                         <field name="partner_name" class="oe_inline"/>
                         <button string="Create Employee" name="create_employee_from_applicant" type="object"
                                     class="oe_link oe_inline" style="margin-left: 8px;"
-                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/> 
+                                    attrs="{'invisible': [('emp_id', '!=', False)]}"/>
                     </h2>
                 </div>
                 <group>
@@ -318,7 +318,7 @@
                 process and follow up all operations: meetings, interviews, etc.
               </p><p>
                 Applicants and their attached CV are created automatically when an email is sent.
-                If you install the document management modules, all resumes are indexed automatically, 
+                If you install the document management modules, all resumes are indexed automatically,
                 so that you can easily search through their content.
               </p>
          </field>
@@ -425,7 +425,7 @@
                                         <div class="oe_job_alias oe_kanban_ellipsis" t-if=" record.alias_id.value and record.state.raw_value == 'recruit'">
                                             <span class="oe_e">%%</span><small><field name="alias_id"/></small>
                                         </div>
-                                        
+
                                     </div>
                                     <t t-if="record.state.raw_value == 'recruit'">
                                         <div class="oe_applications">
@@ -483,7 +483,7 @@
             <field name="context">{'search_default_in_recruitment': 1}</field>
             <field name="help" type="html">
               <p class="oe_view_nocontent_create">
-                 Click here to create a new job or remove the filter on "In Recruitment" to recruit for an on hold job. 
+                 Click here to create a new job or remove the filter on "In Recruitment" to recruit for an on hold job.
               </p>
               <p>
                 Define job position profile and manage recruitment in a context of a particular job: print interview survey, define number of expected new employees, and manage its recruitment pipe