Skip to content

Commit 9857ed7

Browse files
dipakvarmaparthivgls
authored andcommitted
[FIX]core_faculty: fixed name field (openeducat#345)
1 parent 12a2232 commit 9857ed7

File tree

3 files changed

+106
-82
lines changed

3 files changed

+106
-82
lines changed

openeducat_core/demo/faculty_demo.xml

Lines changed: 20 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,8 @@
33
<data noupdate="1">
44
<record id="op_faculty_1" model="op.faculty">
55
<field name="title" ref="base.res_partner_title_mister"/>
6-
<field name="name">James</field>
6+
<field name="name">James D church</field>
7+
<field name="first_name">James</field>
78
<field name="middle_name">D</field>
89
<field name="last_name">Church</field>
910
<field name="gender">male</field>
@@ -22,7 +23,8 @@
2223

2324
<record id="op_faculty_2" model="op.faculty">
2425
<field name="title" ref="base.res_partner_title_mister"/>
25-
<field name="name">Dylan</field>
26+
<field name="name">Dylan Q Hidalgo</field>
27+
<field name="first_name">Dylan</field>
2628
<field name="middle_name">Q</field>
2729
<field name="last_name">Hidalgo</field>
2830
<field name="gender">male</field>
@@ -41,7 +43,8 @@
4143

4244
<record id="op_faculty_3" model="op.faculty">
4345
<field name="title" ref="base.res_partner_title_miss"/>
44-
<field name="name">Lucia</field>
46+
<field name="name">Lucia K Sison</field>
47+
<field name="first_name">Lucia</field>
4548
<field name="middle_name">K</field>
4649
<field name="last_name">Sison</field>
4750
<field name="gender">female</field>
@@ -60,7 +63,8 @@
6063

6164
<record id="op_faculty_4" model="op.faculty">
6265
<field name="title" ref="base.res_partner_title_mister"/>
63-
<field name="name">Badru</field>
66+
<field name="name">Badru V Turay</field>
67+
<field name="first_name">Badru</field>
6468
<field name="middle_name">V</field>
6569
<field name="last_name">Turay</field>
6670
<field name="gender">male</field>
@@ -79,7 +83,8 @@
7983

8084
<record id="op_faculty_5" model="op.faculty">
8185
<field name="title" ref="base.res_partner_title_miss"/>
82-
<field name="name">Maaike</field>
86+
<field name="name">Maaike L Effiong</field>
87+
<field name="first_name">Maaike</field>
8388
<field name="middle_name">L</field>
8489
<field name="last_name">Effiong</field>
8590
<field name="gender">female</field>
@@ -98,7 +103,8 @@
98103

99104
<record id="op_faculty_6" model="op.faculty">
100105
<field name="title" ref="base.res_partner_title_mister"/>
101-
<field name="name">Harpreet Singh</field>
106+
<field name="name">Harpreet Singh K Bagga</field>
107+
<field name="first_name">Harpreet Singh</field>
102108
<field name="middle_name">K</field>
103109
<field name="last_name">Bagga</field>
104110
<field name="gender">male</field>
@@ -117,7 +123,8 @@
117123

118124
<record id="op_faculty_7" model="op.faculty">
119125
<field name="title" ref="base.res_partner_title_miss"/>
120-
<field name="name">Sanjana</field>
126+
<field name="name">Sanjana E Pillay</field>
127+
<field name="first_name">Sanjana</field>
121128
<field name="middle_name">E</field>
122129
<field name="last_name">Pillay</field>
123130
<field name="gender">female</field>
@@ -136,7 +143,8 @@
136143

137144
<record id="op_faculty_8" model="op.faculty">
138145
<field name="title" ref="base.res_partner_title_miss"/>
139-
<field name="name">Tanya</field>
146+
<field name="name">Tanya M Wagle</field>
147+
<field name="first_name">Tanya</field>
140148
<field name="middle_name">M</field>
141149
<field name="last_name">Wagle</field>
142150
<field name="gender">female</field>
@@ -155,7 +163,8 @@
155163

156164
<record id="op_faculty_9" model="op.faculty">
157165
<field name="title" ref="base.res_partner_title_mister"/>
158-
<field name="name">Chang</field>
166+
<field name="name">Chang D Suen</field>
167+
<field name="first_name">Chang</field>
159168
<field name="middle_name">D</field>
160169
<field name="last_name">Suen</field>
161170
<field name="gender">male</field>
@@ -174,7 +183,8 @@
174183

175184
<record id="op_faculty_10" model="op.faculty">
176185
<field name="title" ref="base.res_partner_title_miss"/>
177-
<field name="name">Komal</field>
186+
<field name="name">Komal H Shah</field>
187+
<field name="first_name">Komal</field>
178188
<field name="middle_name">H</field>
179189
<field name="last_name">Shah</field>
180190
<field name="gender">female</field>

openeducat_core/models/faculty.py

Lines changed: 14 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,6 +30,8 @@ class OpFaculty(models.Model):
3030
_inherits = {"res.partner": "partner_id"}
3131
partner_id = fields.Many2one('res.partner', 'Partner',
3232
required=True, ondelete="cascade")
33+
first_name = fields.Char('First Name', size=128, required=True,
34+
translate=True)
3335
middle_name = fields.Char('Middle Name', size=128)
3436
last_name = fields.Char('Last Name', size=128, required=True)
3537
birth_date = fields.Date('Birth Date', required=True)
@@ -67,11 +69,20 @@ def _check_birthdate(self):
6769
raise ValidationError(_(
6870
"Birth Date can't be greater than current date!"))
6971

72+
@api.onchange('first_name', 'middle_name', 'last_name')
73+
def _onchange_name(self):
74+
if not self.middle_name:
75+
self.name = str(self.first_name) + \
76+
" " + str(self.last_name)
77+
else:
78+
self.name = str(self.first_name) + \
79+
" " + str(self.middle_name) + \
80+
" " + str(self.last_name)
81+
7082
def create_employee(self):
7183
for record in self:
7284
vals = {
73-
'name': record.name + ' ' + (record.middle_name or '') +
74-
' ' + record.last_name,
85+
'name': record.name,
7586
'country_id': record.nationality.id,
7687
'gender': record.gender,
7788
'address_home_id': record.partner_id.id
@@ -86,3 +97,4 @@ def get_import_templates(self):
8697
'label': _('Import Template for Faculties'),
8798
'template': '/openeducat_core/static/xls/op_faculty.xls'
8899
}]
100+

0 commit comments

Comments
 (0)