Skip to content

Commit a94347b

Browse files
horilla-opensourcehorilla-opensource
committed
[UPDT]add city field in employee profile
1 parent d89fd76 commit a94347b

File tree

7 files changed

+196
-159
lines changed

7 files changed

+196
-159
lines changed

‎employee/forms.py

+3-1
Original file line numberDiff line numberDiff line change
@@ -55,10 +55,12 @@ def __init__(self, *args, **kwargs):
5555
{"class": "oh-select oh-select-2 select2-hidden-accessible"}
5656
)
5757
elif isinstance(widget, (forms.Textarea)):
58+
if field.label is not None:
59+
label = trans(field.label)
5860
field.widget.attrs.update(
5961
{
6062
"class": "oh-input w-100",
61-
"placeholder": field.label,
63+
"placeholder": label,
6264
"rows": 2,
6365
"cols": 40,
6466
}

‎employee/models.py

+1
Original file line numberDiff line numberDiff line change
@@ -67,6 +67,7 @@ class Employee(models.Model):
6767
address = models.TextField(max_length=200, blank=True, null=True)
6868
country = models.CharField(max_length=30, blank=True, null=True)
6969
state = models.CharField(max_length=30, null=True, blank=True)
70+
city = models.CharField(max_length=30, null=True, blank=True)
7071
zip = models.CharField(max_length=20, null=True, blank=True)
7172
dob = models.DateField(null=True, blank=True)
7273
gender = models.CharField(max_length=10, choices=choice_gender, default="male")

‎employee/templates/employee/create_form/personal_info.html

+60-54
Original file line numberDiff line numberDiff line change
@@ -131,65 +131,71 @@
131131
</div>
132132
</div>
133133
<div class="row">
134-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
135-
<label class="oh-label d-block" for="state">{% trans "Zip Code" %}</label>
136-
{{form.zip}}
137-
{{form.zip.errors}}
138-
</div>
139-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
140-
<label class="oh-label d-block" for="state">{% trans "Emergency Contact" %}</label>
141-
{{form.emergency_contact}}
142-
{{form.emergency_contact.errors}}
143-
</div>
144-
</div>
145-
<div class="row">
146-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
147-
<label class="oh-label d-block" for="emergencyContactName">{% trans "Contact Name" %}</label>
148-
{{form.emergency_contact_name}}
149-
{{form.emergency_contact_name.errors}}
150-
</div>
151-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
152-
<label class="oh-label d-block" for="emergencyContactRelation">{% trans "Emergency Contact Relation" %}</label>
153-
{{form.emergency_contact_relation}}
154-
{{form.emergency_contact_relation.errors}}
155-
</div>
156-
</div>
157-
<div class="row">
158-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
159-
160-
<label class="oh-label d-block" for="marital_status">{% trans "Maritial Status" %}</label>
161-
{{form.marital_status}}
162-
{{form.marital_status.errors}}
163-
</div>
164-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
165-
<label class="oh-label d-block" for="children">{% trans "Children" %}</label>
166-
{{form.children}}
167-
{{form.children.errors}}
168-
</div>
169-
</div>
170-
171-
172-
<div class="row">
173-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
174-
<label class="oh-label d-block" for="experience">{% trans "Experience" %}</label>
175-
{{form.experience}}
176-
{{form.experience.errors}}
177-
</div>
178-
179-
<div class="col-12 col-sm-12 col-md-12 col-lg-2">
134+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
135+
<label class="oh-label d-block" for="state">{% trans "City" %}</label>
136+
{{form.city}}
137+
{{form.city.errors}}
138+
</div>
139+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
140+
<label class="oh-label d-block" for="state">{% trans "Zip Code" %}</label>
141+
{{form.zip}}
142+
{{form.zip.errors}}
143+
</div>
144+
</div>
145+
<div class="row">
146+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
147+
<label class="oh-label d-block" for="state">{% trans "Emergency Contact" %}</label>
148+
{{form.emergency_contact}}
149+
{{form.emergency_contact.errors}}
150+
</div>
151+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
152+
<label class="oh-label d-block" for="emergencyContactName">{% trans "Contact Name" %}</label>
153+
{{form.emergency_contact_name}}
154+
{{form.emergency_contact_name.errors}}
155+
</div>
156+
</div>
157+
<div class="row">
158+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
159+
<label class="oh-label d-block" for="emergencyContactRelation">{% trans "Emergency Contact Relation" %}</label>
160+
{{form.emergency_contact_relation}}
161+
{{form.emergency_contact_relation.errors}}
162+
</div>
163+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
164+
<label class="oh-label d-block" for="experience">{% trans "Experience" %}</label>
165+
{{form.experience}}
166+
{{form.experience.errors}}
167+
</div>
168+
</div>
169+
<div class="row">
170+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
171+
172+
<label class="oh-label d-block" for="marital_status">{% trans "Maritial Status" %}</label>
173+
{{form.marital_status}}
174+
{{form.marital_status.errors}}
175+
</div>
176+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
177+
<label class="oh-label d-block" for="children">{% trans "Children" %}</label>
178+
{{form.children}}
179+
{{form.children.errors}}
180+
</div>
181+
</div>
182+
183+
184+
<div class="row">
185+
<div class="col-12 col-sm-12 col-md-12 col-lg-2">
180186
<label class="oh-label me-2" for="isActive">{% trans "Is Active" %}?</label>
181187
<div class="oh-switch">
182188
{{form.is_active}}
183189
{{form.is_active.errors}}
184190
</div>
185-
</div>
186-
</div>
187-
<hr class="mt-5 mb-3">
188-
<div class="w-100 d-flex align-items-center justify-content-e nd">
189-
<button type="submit" class="oh-btn oh-btn--secondary oh-btn--w-100-resp">
190-
{% trans "Save Changes" %}
191-
</button>
192-
</div>
191+
</div>
192+
</div>
193+
<hr class="mt-5 mb-3 d-flex flex-row-reverse">
194+
<div class="col-lg-4 ">
195+
<button type="submit" class="oh-btn oh-btn--secondary">
196+
{% trans "Save Changes" %}
197+
</button>
198+
</div>
193199
</form>
194200
</div>
195201
</div>

‎employee/templates/employee/profile/personal_info.html

+57-52
Original file line numberDiff line numberDiff line change
@@ -92,66 +92,71 @@
9292
</div>
9393
</div>
9494
<div class="row">
95-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
96-
<label class="oh-label d-block" for="state">{% trans "Zip Code" %}</label>
97-
{{form.zip}}
98-
{{form.zip.errors}}
99-
</div>
100-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
101-
<label class="oh-label d-block" for="state">{% trans "Emergency Contact" %}</label>
102-
{{form.emergency_contact}}
103-
{{form.emergency_contact.errors}}
104-
</div>
105-
</div>
106-
<div class="row">
107-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
108-
<label class="oh-label d-block" for="emergencyContactName">{% trans "Contact Name" %}</label>
109-
{{form.emergency_contact_name}}
110-
{{form.emergency_contact_name.errors}}
111-
</div>
112-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
113-
<label class="oh-label d-block" for="emergencyContactRelation">{% trans "Emergency Contact Relation" %}</label>
114-
{{form.emergency_contact_relation}}
115-
{{form.emergency_contact_relation.errors}}
116-
</div>
117-
</div>
118-
<div class="row">
119-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
95+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
96+
<label class="oh-label d-block" for="state">{% trans "City" %}</label>
97+
{{form.city}}
98+
{{form.city.errors}}
99+
</div>
100+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
101+
<label class="oh-label d-block" for="state">{% trans "Zip Code" %}</label>
102+
{{form.zip}}
103+
{{form.zip.errors}}
104+
</div>
105+
</div>
106+
<div class="row">
107+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
108+
<label class="oh-label d-block" for="state">{% trans "Emergency Contact" %}</label>
109+
{{form.emergency_contact}}
110+
{{form.emergency_contact.errors}}
111+
</div>
112+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
113+
<label class="oh-label d-block" for="emergencyContactName">{% trans "Contact Name" %}</label>
114+
{{form.emergency_contact_name}}
115+
{{form.emergency_contact_name.errors}}
116+
</div>
117+
</div>
118+
<div class="row">
119+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
120+
<label class="oh-label d-block" for="emergencyContactRelation">{% trans "Emergency Contact Relation" %}</label>
121+
{{form.emergency_contact_relation}}
122+
{{form.emergency_contact_relation.errors}}
123+
</div>
124+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
125+
<label class="oh-label d-block" for="experience">{% trans "Experience" %}</label>
126+
{{form.experience}}
127+
{{form.experience.errors}}
128+
</div>
129+
</div>
130+
<div class="row">
131+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
120132

121-
<label class="oh-label d-block" for="marital_status">{% trans "Maritial Status" %}</label>
122-
{{form.marital_status}}
123-
{{form.marital_status.errors}}
124-
</div>
125-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
126-
<label class="oh-label d-block" for="children">{% trans "Children" %}</label>
127-
{{form.children}}
128-
{{form.children.errors}}
129-
</div>
130-
</div>
133+
<label class="oh-label d-block" for="marital_status">{% trans "Maritial Status" %}</label>
134+
{{form.marital_status}}
135+
{{form.marital_status.errors}}
136+
</div>
137+
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
138+
<label class="oh-label d-block" for="children">{% trans "Children" %}</label>
139+
{{form.children}}
140+
{{form.children.errors}}
141+
</div>
142+
</div>
131143

132144

133-
<div class="row">
134-
<div class="col-12 col-sm-12 col-md-12 col-lg-6">
135-
<label class="oh-label d-block" for="experience">{% trans "Experience" %}</label>
136-
{{form.experience}}
137-
{{form.experience.errors}}
138-
</div>
139-
140-
<div class="col-12 col-sm-12 col-md-12 col-lg-2">
145+
<div class="row">
146+
<div class="col-12 col-sm-12 col-md-12 col-lg-2">
141147
<label class="oh-label me-2" for="isActive">{% trans "Is Active" %}?</label>
142148
<div class="oh-switch">
143149
{{form.is_active}}
144150
{{form.is_active.errors}}
145151
</div>
146-
</div>
147-
</div>
148-
149-
<hr class="mt-5 mb-3">
150-
<div class="w-100 d-flex align-items-center justify-content-end">
151-
<button type="submit" class="oh-btn oh-btn--secondary oh-btn--w-100-resp">
152-
{% trans "Save Changes" %}
153-
</button>
154-
</div>
152+
</div>
153+
</div>
154+
<hr class="mt-5 mb-3 d-flex flex-row-reverse w-100">
155+
<div class="col-lg-4 ">
156+
<button type="submit" class="oh-btn oh-btn--secondary">
157+
{% trans "Save Changes" %}
158+
</button>
159+
</div>
155160
</form>
156161
</div>
157162
</div>

‎employee/templates/employee/profile/profile_view.html

+9
Original file line numberDiff line numberDiff line change
@@ -181,6 +181,15 @@ <h1 class="oh-profile__info-name">{{employee}}</h1>
181181
{{employee.state}}
182182
</span>
183183
</li>
184+
<li class="oh-profile__card-info-item">
185+
<span class="oh-profile__info-label mb-1">
186+
<ion-icon name="planet-outline"></ion-icon>
187+
<span>{% trans "City" %}</span>
188+
</span>
189+
<span class="oh-profile__info-value">
190+
{{employee.city}}
191+
</span>
192+
</li>
184193
<li class="oh-profile__card-info-item">
185194
<span class="oh-profile__info-label mb-1">
186195
<ion-icon name="book-outline"></ion-icon>

0 commit comments

Comments
 (0)