Commit 5977e923 authored by Jérome Perrin's avatar Jérome Perrin

Generate accessors for career activity on person.



git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@15711 20353a03-c40f-0410-a6d1-a30d3c3de9de
parent 5763f8a9
...@@ -198,6 +198,7 @@ class Person: ...@@ -198,6 +198,7 @@ class Person:
, 'skill', 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list' , 'skill', 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list'
, 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value' , 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value'
, 'grade', 'grade_id', 'grade_title', 'grade_value' , 'grade', 'grade_id', 'grade_title', 'grade_value'
, 'activity', 'activity_id', 'activity_title', 'activity_value'
, 'role', 'role_id', 'role_title', 'role_value' , 'role', 'role_id', 'role_title', 'role_value'
, 'function', 'function_id', 'function_title', 'function_value' , 'function', 'function_id', 'function_title', 'function_value'
, 'activity', 'activity_id', 'activity_title', 'activity_value' , 'activity', 'activity_id', 'activity_title', 'activity_value'
......
...@@ -511,10 +511,12 @@ class TestHR(ERP5TypeTestCase): ...@@ -511,10 +511,12 @@ class TestHR(ERP5TypeTestCase):
person.setCareerStartDate(dummy_date1) person.setCareerStartDate(dummy_date1)
person.setCareerSalaryCoefficient(1) person.setCareerSalaryCoefficient(1)
person.setCareerCollectiveAgreementTitle('SYNTEC convention') person.setCareerCollectiveAgreementTitle('SYNTEC convention')
person.setCareerActivity('software')
self.assertEquals(person.getCareerStopDate() , dummy_date2) self.assertEquals(person.getCareerStopDate() , dummy_date2)
self.assertEquals(person.getCareerStartDate() , dummy_date1) self.assertEquals(person.getCareerStartDate() , dummy_date1)
self.assertEquals(person.getCareerSalaryCoefficient() , 1) self.assertEquals(person.getCareerSalaryCoefficient() , 1)
self.assertEquals(person.getCareerCollectiveAgreementTitle(), 'SYNTEC convention') self.assertEquals(person.getCareerCollectiveAgreementTitle(), 'SYNTEC convention')
self.assertEquals(person.getCareerActivityTitle(), 'Software')
# Set & Check function # Set & Check function
function_categories = self.getCategoryList(base_category='function') function_categories = self.getCategoryList(base_category='function')
...@@ -629,6 +631,13 @@ class TestHR(ERP5TypeTestCase): ...@@ -629,6 +631,13 @@ class TestHR(ERP5TypeTestCase):
self.assertEquals(person.getCareerGradeTitle(), default_career.getGradeTitle()) self.assertEquals(person.getCareerGradeTitle(), default_career.getGradeTitle())
self.assertEquals(person.getCareerGradeValue(), default_career.getGradeValue()) self.assertEquals(person.getCareerGradeValue(), default_career.getGradeValue())
self.assertEquals(person.getCareerActivity(),
default_career.getActivity())
self.assertEquals(person.getCareerActivityTitle(),
default_career.getActivityTitle())
self.assertEquals(person.getCareerActivityValue(),
default_career.getActivityValue())
self.assertEquals(person.getCareerSalaryLevel() , default_career.getSalaryLevel()) self.assertEquals(person.getCareerSalaryLevel() , default_career.getSalaryLevel())
self.assertEquals(person.getCareerSalaryLevelTitle(), default_career.getSalaryLevelTitle()) self.assertEquals(person.getCareerSalaryLevelTitle(), default_career.getSalaryLevelTitle())
self.assertEquals(person.getCareerSalaryLevelValue(), default_career.getSalaryLevelValue()) self.assertEquals(person.getCareerSalaryLevelValue(), default_career.getSalaryLevelValue())
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment