From 12822aeadae80c35ea12be697de18d65b7e1191f Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Wed, 15 May 2024 22:19:42 +0530
Subject: [PATCH] [UPDT] BASE: Form design and style updates

---
 .../base/action_type/action_type_form.html    |  2 +-
 base/templates/base/company/company_form.html | 16 ++---
 base/templates/base/company/date.html         | 68 ++++++++++---------
 .../base/department/department_form.html      | 16 +----
 .../base/employee_tag/employee_tag_form.html  |  2 +-
 .../employee_type/employee_type_form.html     | 24 +++----
 .../base/job_position/job_position_form.html  | 17 +++--
 .../base/job_role/job_role_form.html          | 13 ++--
 .../htmx/rotating_shift_form.html             |  6 +-
 .../htmx/rotating_work_type_form.html         |  6 +-
 base/templates/base/shift/schedule_form.html  | 35 ++--------
 base/templates/base/shift/shift_form.html     | 40 +++--------
 .../base/work_type/work_type_form.html        | 26 +++----
 13 files changed, 108 insertions(+), 163 deletions(-)

diff --git a/base/templates/base/action_type/action_type_form.html b/base/templates/base/action_type/action_type_form.html
index a8b43c245..eb1033466 100644
--- a/base/templates/base/action_type/action_type_form.html
+++ b/base/templates/base/action_type/action_type_form.html
@@ -2,7 +2,7 @@
 <div class="oh-modal__dialog-header pb-0">
   	<h2 class="oh-modal__dialog-title" id="createModalTitle">
 		{% if act_id %}
-			{% trans "Action Type Update" %}
+			{% trans "Update Action Type" %}
 		{% else %}
 			{% trans "Create Action Type" %}
 		{% endif %}
diff --git a/base/templates/base/company/company_form.html b/base/templates/base/company/company_form.html
index b1561333d..d2ba45e9b 100644
--- a/base/templates/base/company/company_form.html
+++ b/base/templates/base/company/company_form.html
@@ -12,21 +12,21 @@
 	{% csrf_token %}
 	<div class="oh-inner-sidebar-content__body">
 		<div class="oh-input-group mb-2">
-			<label for="id_{{form.company.name}}" class="settings-label mb-1">{% trans "Company" %}</label>
+			<label for="id_{{form.company.name}}" class=" mb-1">{% trans "Company" %}</label>
 			{{form.company}} {{form.company.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
 			<div class="oh-switch">
-			<label for="id_{{form.hq.name}}" class="settings-label mb-1 mr-3" style="padding-right: 15px;">{% trans "Hq" %}</label>
+			<label for="id_{{form.hq.name}}" class=" mb-1 mr-3" style="padding-right: 15px;">{% trans "Hq" %}</label>
 				{{form.hq}}
 			</div>
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="id_{{form.address.name}}" class="settings-label mb-1">{% trans "Address" %}</label>
+			<label for="id_{{form.address.name}}" class=" mb-1">{% trans "Address" %}</label>
 			{{form.address}} {{form.address.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="" class="settings-label mb-1">{% trans "Country" %}</label>
+			<label for="" class=" mb-1">{% trans "Country" %}</label>
 			<select name="country" id="id_country" class="oh-select oh-select-2">
 				<option value="{{form.instance.country}}" selected>
 					{{form.instance.country}}
@@ -35,7 +35,7 @@
 			{{form.country.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="" class="settings-label mb-1">{% trans "State" %}</label>
+			<label for="" class=" mb-1">{% trans "State" %}</label>
 			<select name="state" id="id_state" class="oh-select oh-select-2">
 				<option value="{{form.instance.state}}" selected>
 					{{form.instance.state}}
@@ -44,15 +44,15 @@
 			{{form.state.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="id_{{form.city.name}}" class="settings-label mb-1">{% trans "City" %}</label>
+			<label for="id_{{form.city.name}}" class=" mb-1">{% trans "City" %}</label>
 			{{form.city}} {{form.city.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="id_{{form.zip.name}}" class="settings-label mb-1">{% trans "Zip" %}</label>
+			<label for="id_{{form.zip.name}}" class=" mb-1">{% trans "Zip" %}</label>
 			{{form.zip}} {{form.zip.errors}}
 		</div>
 		<div class="oh-input-group mb-2">
-			<label for="id_{{form.icon.name}}" class="settings-label mb-1">{% trans "Icon" %}</label>
+			<label for="id_{{form.icon.name}}" class=" mb-1">{% trans "Icon" %}</label>
 			{{form.icon}} {{form.icon.errors}}
 		</div>
 	</div>
diff --git a/base/templates/base/company/date.html b/base/templates/base/company/date.html
index f8fe96a90..38dd9a189 100644
--- a/base/templates/base/company/date.html
+++ b/base/templates/base/company/date.html
@@ -8,34 +8,38 @@
 </div>
 {% if perms.base.change_company %}
 
-    <label for="" class="settings-label mb-1">{% trans "Select Date Format:" %}</label>
-    <select id="dateFormat" class="oh-select oh-select-2">
-        <option value="">--------------</option>
-        <option value="DD-MM-YYYY">{% trans "Day, Month, Year (e.g., 30-12-2023)" %}</option>
-        <option value="DD.MM.YYYY">{% trans "Day, Month, Year (e.g., 30.12.2023)" %}</option>
-        <option value="DD/MM/YYYY">{% trans "Day, Month, Year (e.g., 30/12/2023)" %}</option>
-        <option value="MM/DD/YYYY">{% trans "Month, Day, Year (e.g., 12/30/2023)" %}</option>
-        <option value="YYYY-MM-DD">{% trans "Year, Month, Day (e.g., 2023-12-30)" %}</option>
-        <option value="YYYY/MM/DD">{% trans "Year, Month, Day (e.g., 2023/12/30)" %}</option>
-        <option value="MMMM D, YYYY">{% trans "Full Month Name, Day, Year (e.g., January 1, 2023)" %}</option>
-        <option value="DD MMMM, YYYY">{% trans "Day, Full Month Name, Year (e.g., 1 January, 2023)" %}</option>
-        <option value="MMM. D, YYYY">{% trans "Abbreviated Month Name, Day, Year (e.g., Jan. 1, 2023)" %}</option>
-        <option value="D MMM. YYYY">{% trans "Day, Abbreviated Month Name, Year (e.g., 1 Jan. 2023)" %}</option>
-        <option value="dddd, MMMM D, YYYY">{% trans "Full Day Name, Full Month Name, Day, Year (e.g., Monday, January 1, 2023)" %}</option>
-    </select>
-
-
-    <button onclick="saveDateFormat()"
-    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
-    >{% trans "Save Date Format" %}</button>
+        <label for="" class="settings-label mb-1">{% trans "Select Date Format:" %}</label>
+        <div class="w-75 d-flex">
+            <select id="dateFormat" class="oh-select oh-select-2">
+                <option value="">--------------</option>
+                <option value="DD-MM-YYYY">{% trans "Day, Month, Year (e.g., 30-12-2023)" %}</option>
+                <option value="DD.MM.YYYY">{% trans "Day, Month, Year (e.g., 30.12.2023)" %}</option>
+                <option value="DD/MM/YYYY">{% trans "Day, Month, Year (e.g., 30/12/2023)" %}</option>
+                <option value="MM/DD/YYYY">{% trans "Month, Day, Year (e.g., 12/30/2023)" %}</option>
+                <option value="YYYY-MM-DD">{% trans "Year, Month, Day (e.g., 2023-12-30)" %}</option>
+                <option value="YYYY/MM/DD">{% trans "Year, Month, Day (e.g., 2023/12/30)" %}</option>
+                <option value="MMMM D, YYYY">{% trans "Full Month Name, Day, Year (e.g., January 1, 2023)" %}</option>
+                <option value="DD MMMM, YYYY">{% trans "Day, Full Month Name, Year (e.g., 1 January, 2023)" %}</option>
+                <option value="MMM. D, YYYY">{% trans "Abbreviated Month Name, Day, Year (e.g., Jan. 1, 2023)" %}</option>
+                <option value="D MMM. YYYY">{% trans "Day, Abbreviated Month Name, Year (e.g., 1 Jan. 2023)" %}</option>
+                <option value="dddd, MMMM D, YYYY">{% trans "Full Day Name, Full Month Name, Day, Year (e.g., Monday, January 1, 2023)" %}</option>
+            </select>
+            <div class="w-100">
+                <button onclick="saveDateFormat()"
+                class="oh-btn oh-btn--secondary ms-3 oh-btn--w-100-resp" style="height: 48px;"
+                >{% trans "Save Date Format" %}</button>
+            </div>
+        </div>
 
 {% endif %}
 
-<div style=" font-size: 20px; color: hsl(8,77%,56%); margin-top:20px">
+<div style=" font-size: 20px; color: hsl(8,77%,56%); margin-top:20px; margin-bottom:80px ;">
     <b>{% trans "Current Date Format"%} &nbsp :</b> &nbsp
     <span id="dateDisplay" style="font-size: 18px; color: black;" class='mt-3'></span>
 </div>
 
+<hr>
+
 <!-- Time format selection-->
 
 <div class="oh-inner-sidebar-content__header" style="margin-top:80px">
@@ -45,16 +49,18 @@
 {% if perms.base.change_company %}
 
 <label for="timeFormat" class="settings-label mb-1">{% trans "Select Time Format:" %}</label>
-<select id="timeFormat" class="oh-select oh-select-2">
-    <option value="">--------------</option>
-    <option value="hh:mm A">{% trans "12 Hr. (e.g., 06:00 AM or 06:00 PM)" %}</option>
-    <option value="HH:mm">{% trans "24 Hr. (e.g., 06:00 or 18:00)" %}</option>
-</select>
-
-<button onclick="saveTimeFormat()"
-    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
->{% trans "Save Time Format" %}</button>
-
+<div class="w-75 d-flex">
+    <select id="timeFormat" class="oh-select oh-select-2">
+        <option value="">--------------</option>
+        <option value="hh:mm A">{% trans "12 Hr. (e.g., 06:00 AM or 06:00 PM)" %}</option>
+        <option value="HH:mm">{% trans "24 Hr. (e.g., 06:00 or 18:00)" %}</option>
+    </select>
+    <div class="w-100">
+        <button onclick="saveTimeFormat()"
+            class="oh-btn oh-btn--secondary ms-3 oh-btn--w-100-resp" style="height: 48px;"
+        >{% trans "Save Time Format" %}</button>
+    </div>
+</div>
 {% endif %}
 
 <div style="font-size: 20px; color: hsl(8, 77%, 56%); margin-top: 20px">
diff --git a/base/templates/base/department/department_form.html b/base/templates/base/department/department_form.html
index d21c24acc..1061c1826 100644
--- a/base/templates/base/department/department_form.html
+++ b/base/templates/base/department/department_form.html
@@ -21,21 +21,7 @@
     class="oh-profile-section"
   >
     {% csrf_token %} {{form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <label class="settings-label mb-1" for="id_{{form.department.name}}">
-        {% trans "Department" %}
-      </label>
-      <div class="oh-input-group">
-        {{form.department.errors}} {{form.department}}
-      </div>
-    </div>
-
-    <div class="oh-inner-sidebar-content__body">
-      <label class="settings-label mb-1" for=""> {% trans "Company" %} </label>
-      <div class="oh-input-group">
-        {{form.company_id.errors}} {{form.company_id}}
-      </div>
-    </div>
+    {{form.as_p}}
     <div class="oh-modal__dialog-footer p-0 mt-3">
       <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow" >
           {% trans "Save" %}
diff --git a/base/templates/base/employee_tag/employee_tag_form.html b/base/templates/base/employee_tag/employee_tag_form.html
index d29693146..986d1934c 100644
--- a/base/templates/base/employee_tag/employee_tag_form.html
+++ b/base/templates/base/employee_tag/employee_tag_form.html
@@ -1,7 +1,7 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <h2 class="oh-modal__dialog-title" id="createModalTitle">
-    {% if tag_id %} {% trans "Employee Tag Update" %} {% else %} {% trans "Create Employee Tag" %} {% endif %}
+    {% if tag_id %} {% trans "Update Employee Tag" %} {% else %} {% trans "Create Employee Tag" %} {% endif %}
   </h2>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
diff --git a/base/templates/base/employee_type/employee_type_form.html b/base/templates/base/employee_type/employee_type_form.html
index f511b8902..019dbeb48 100644
--- a/base/templates/base/employee_type/employee_type_form.html
+++ b/base/templates/base/employee_type/employee_type_form.html
@@ -1,8 +1,13 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header">
   <span class="oh-modal__dialog-title" id="editModal1ModalLabel"
-    >{% trans "Employee Type" %}</span
-  >
+    >
+    {% if employee_type.id %}
+      {% trans "Update Employee Type" %}
+    {% else %}
+      {% trans "Create Employee Type" %}
+    {% endif %}
+</span>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
@@ -22,20 +27,7 @@
     class="oh-profile-section"
     >
     {% csrf_token %} {{form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <label class="settings-label mb-1" for="">
-        {% trans "Employee Type" %}
-      </label>
-      <div class="oh-input-group">
-        {{form.employee_type.errors}} {{form.employee_type}}
-      </div>
-    </div>
-    <div class="oh-inner-sidebar-content__body">
-      <label class="settings-label mb-1" for=""> {% trans "Company" %} </label>
-      <div class="oh-input-group">
-        {{form.company_id.errors}} {{form.company_id}}
-      </div>
-    </div>
+    {{form.as_p}}
     <div class="oh-modal__dialog-footer p-0 mt-3">
       <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
         {% trans "Save" %}
diff --git a/base/templates/base/job_position/job_position_form.html b/base/templates/base/job_position/job_position_form.html
index 06084c031..f4c92e511 100644
--- a/base/templates/base/job_position/job_position_form.html
+++ b/base/templates/base/job_position/job_position_form.html
@@ -1,8 +1,13 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <span class="oh-modal__dialog-title" id="editModal1ModalLabel"
-    >{% trans "Job Position" %}</span
-  >
+    >
+    {% if job_position.id %}
+      {% trans "Update Job Position" %}
+    {% else %}
+      {% trans "Create Job Position" %}
+    {% endif %}
+  </span>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
@@ -23,14 +28,14 @@
     {% csrf_token %}
     <div class="oh-inner-sidebar-content__body">
       <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="id_{{form.department_id.name}}">
-          {% trans "Department" %}
+        <label class="mb-1" for="id_{{form.department_id.name}}">
+          {% trans "Department:" %}
         </label>
         {{form.department_id}} {{form.department_id.errors}}
       </div>
       <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="id_{{form.job_position.name}}">
-          {% trans "Job Position" %}
+        <label class="mb-1" for="id_{{form.job_position.name}}">
+          {% trans "Job Position:" %}
         </label>
         {{form.job_position}} {{form.job_position.errors}}
       </div>
diff --git a/base/templates/base/job_role/job_role_form.html b/base/templates/base/job_role/job_role_form.html
index 5597f6c58..b85f929a1 100644
--- a/base/templates/base/job_role/job_role_form.html
+++ b/base/templates/base/job_role/job_role_form.html
@@ -1,8 +1,13 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <span class="oh-modal__dialog-title" id="confirmModalLabel"
-    >{% trans "Job Role" %}</span
-  >
+    >
+    {% if job_role.id %}
+      {% trans "Update Job Role" %}
+    {% else %}
+      {% trans "Create Job Role" %}
+    {% endif %}
+  </span>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
@@ -24,11 +29,11 @@
     {% csrf_token %} {{form.non_field_errors}}
     <div class="oh-inner-sidebar-content__body">
       <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1"> {% trans "Job Position" %} </label>
+        <label class="mb-1"> {% trans "Job Position:" %} </label>
         {{form.job_position_id.errors}} {{form.job_position_id}}
       </div>
       <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1"> {% trans "Job Role" %} </label>
+        <label class="mb-1"> {% trans "Job Role:" %} </label>
         {{form.job_role.errors}} {{form.job_role}}
       </div>
     </div>
diff --git a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
index 51ba722ff..168b33135 100644
--- a/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
+++ b/base/templates/base/rotating_shift/htmx/rotating_shift_form.html
@@ -1,7 +1,11 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-    {% trans "Rotating Shift" %}
+    {% if rshift.id %}
+      {% trans "Update Rotating Shift" %}
+    {% else %}
+      {% trans "Create Rotating Shift" %}
+    {% endif %}
   </h2>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
diff --git a/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html b/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
index 70c3febb3..9bf033ddc 100644
--- a/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
+++ b/base/templates/base/rotating_work_type/htmx/rotating_work_type_form.html
@@ -1,7 +1,11 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-    {% trans "Rotating Work Type" %}
+    {% if r_type.id %}
+      {% trans "Update Rotating Work Type" %}
+    {% else %}
+      {% trans "Create Rotating Work Type" %}
+    {% endif %}
   </h2>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
diff --git a/base/templates/base/shift/schedule_form.html b/base/templates/base/shift/schedule_form.html
index 7c8f6f98f..577c5e81b 100644
--- a/base/templates/base/shift/schedule_form.html
+++ b/base/templates/base/shift/schedule_form.html
@@ -1,7 +1,11 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <h2 class="oh-modal__dialog-title" id="editModal1ModalLabel">
-    {% trans "Employee Shift Schedule" %}
+    {% if shift_schedule.id %}
+      {% trans "Update Employee Shift Schedule" %}
+    {% else %}
+      {% trans "Create Employee Shift Schedule" %}
+    {% endif %}
   </h2>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
@@ -19,34 +23,7 @@
     class="oh-profile-section"
   >
     {% csrf_token %} {{ form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for=""> {% trans "Shift" %} </label>
-        {{form.shift_id.errors}} {{form.shift_id}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for=""> {% trans "Days" %} </label>
-        {{form.day.errors}} {{form.day}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Minimum Hour" %}
-        </label>
-        {{form.minimum_working_hour.errors}} {{form.minimum_working_hour}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Shift Start Time" %}
-        </label>
-        {{form.start_time.errors}} {{form.start_time}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Shift End Time" %}
-        </label>
-        {{form.end_time.errors}} {{form.end_time}}
-      </div>
-    </div>
+    {{form.as_p}}
     <div class="oh-modal__dialog-footer p-0 mt-3">
       <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
         {% trans "Save" %}
diff --git a/base/templates/base/shift/shift_form.html b/base/templates/base/shift/shift_form.html
index e04ddf1a0..b84f9fb23 100644
--- a/base/templates/base/shift/shift_form.html
+++ b/base/templates/base/shift/shift_form.html
@@ -1,8 +1,13 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <span class="oh-modal__dialog-title" id="createModal1ModalLabel"
-    >{% trans "Employee Shift" %}</span
-  >
+    >
+    {% if shift.id %}
+      {% trans "Update Employee Shift" %}
+    {% else %}
+      {% trans "Create Employee Shift" %}
+    {% endif %}
+    </span>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
@@ -22,36 +27,7 @@
     class="oh-profile-section"
     >
     {% csrf_token %} {{form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for=""> {% trans "Shift" %} </label>
-        {{form.employee_shift.errors}} {{form.employee_shift}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Full Time Weekly" %}
-        </label>
-        {{form.weekly_full_time.errors}} {{form.weekly_full_time}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Full Time" %}
-        </label>
-        {{form.full_time.errors}} {{form.full_time}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Grace Time" %}
-        </label>
-        {{form.grace_time_id.errors}} {{form.grace_time_id}}
-      </div>
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Company" %}
-        </label>
-        {{form.company_id.errors}} {{form.company_id}}
-      </div>
-    </div>
+    {{form.as_p}}
     <div class="oh-modal__dialog-footer p-0 mt-3">
       <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
         {% trans "Save" %}
diff --git a/base/templates/base/work_type/work_type_form.html b/base/templates/base/work_type/work_type_form.html
index ee7dcb1ac..f3e65e8ee 100644
--- a/base/templates/base/work_type/work_type_form.html
+++ b/base/templates/base/work_type/work_type_form.html
@@ -1,8 +1,13 @@
 {% load i18n %}
 <div class="oh-modal__dialog-header pb-0">
   <span class="oh-modal__dialog-title" id="createModalLabel"
-    >{% trans "Work Type" %}</span
-  >
+    >
+    {% if work_type.id %}
+      {% trans "Update Work Type" %}
+    {% else %}
+      {% trans "Create Work Type" %}
+    {% endif %}
+  </span>
   <button class="oh-modal__close" aria-label="Close">
     <ion-icon name="close-outline"></ion-icon>
   </button>
@@ -22,22 +27,7 @@
     class="oh-profile-section"
   >
     {% csrf_token %} {{form.non_field_errors}}
-    <div class="oh-inner-sidebar-content__body">
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Work Type" %}
-        </label>
-        {{form.work_type.errors}} {{form.work_type}}
-      </div>
-    </div>
-    <div class="oh-inner-sidebar-content__body">
-      <div class="oh-input-group mb-2">
-        <label class="settings-label mb-1" for="">
-          {% trans "Company" %}
-        </label>
-        {{form.company_id.errors}} {{form.company_id}}
-      </div>
-    </div>
+    {{form.as_p}}
     <div class="oh-modal__dialog-footer p-0 mt-3">
       <button type="submit" class="oh-btn oh-btn--secondary oh-btn--shadow">
         {% trans "Save" %}