[Erp5-report] r15711 - in /erp5/trunk/products/ERP5: PropertySheet/ tests/

[nobody at svn.erp5.org]

Author: jerome
Date: Thu Aug 16 16:02:54 2007
New Revision: 15711

URL: http://svn.erp5.org?rev=15711&view=rev
Log:
Generate accessors for career activity on person.


Modified:
    erp5/trunk/products/ERP5/PropertySheet/Person.py
    erp5/trunk/products/ERP5/tests/testERP5HR.py

Modified: erp5/trunk/products/ERP5/PropertySheet/Person.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/PropertySheet/Person.py?rev=15711&r1=15710&r2=15711&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/PropertySheet/Person.py (original)
+++ erp5/trunk/products/ERP5/PropertySheet/Person.py Thu Aug 16 16:02:54 2007
@@ -198,6 +198,7 @@
                               , 'skill', 'skill_list', 'skill_id_list', 'skill_title_list', 'skill_value_list'
                               , 'salary_level', 'salary_level_id', 'salary_level_title', 'salary_level_value'
                               , 'grade', 'grade_id', 'grade_title', 'grade_value'
+                              , 'activity', 'activity_id', 'activity_title', 'activity_value'
                               , 'role', 'role_id', 'role_title', 'role_value'
                               , 'function', 'function_id', 'function_title', 'function_value'
                               , 'activity', 'activity_id', 'activity_title', 'activity_value'

Modified: erp5/trunk/products/ERP5/tests/testERP5HR.py
URL: http://svn.erp5.org/erp5/trunk/products/ERP5/tests/testERP5HR.py?rev=15711&r1=15710&r2=15711&view=diff
==============================================================================
--- erp5/trunk/products/ERP5/tests/testERP5HR.py (original)
+++ erp5/trunk/products/ERP5/tests/testERP5HR.py Thu Aug 16 16:02:54 2007
@@ -511,10 +511,12 @@
     person.setCareerStartDate(dummy_date1)
     person.setCareerSalaryCoefficient(1)
     person.setCareerCollectiveAgreementTitle('SYNTEC convention')
+    person.setCareerActivity('software')
     self.assertEquals(person.getCareerStopDate()                , dummy_date2)
     self.assertEquals(person.getCareerStartDate()               , dummy_date1)
     self.assertEquals(person.getCareerSalaryCoefficient()       , 1)
     self.assertEquals(person.getCareerCollectiveAgreementTitle(), 'SYNTEC convention')
+    self.assertEquals(person.getCareerActivityTitle(), 'Software')
 
     # Set & Check function
     function_categories = self.getCategoryList(base_category='function')
@@ -628,6 +630,13 @@
     self.assertEquals(person.getCareerGrade()     , default_career.getGrade())
     self.assertEquals(person.getCareerGradeTitle(), default_career.getGradeTitle())
     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.getCareerSalaryLevelTitle(), default_career.getSalaryLevelTitle())