[UPDT] BASE : Settings page reordering and bug fixes

base/templates/base/audit_tag/employee_account_block_unblock.html

@@ -6,7 +6,7 @@
 <form action="{% url 'enable-account-block-unblock' %}" method="post">
     {% csrf_token %}
   <div class="oh-label__info" for="enable_block_unblock">
-    <label class="oh-label" for="enable_block_unblock">{% trans "Restric Login Account" %}</label> 
+    <label class="oh-label" for="enable_block_unblock">{% trans "Restrict Login Account" %}</label> 
     <span class="oh-info mr-2" title="{% trans "By enabling this feature, you can block or unblock an employee's account." %}">
     </span> 
   </div>

base/templates/base/department/department_view.html

@@ -5,7 +5,7 @@
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Department" %}</div>
 				{% if perms.base.change_department or perms.base.delete_department %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>

base/templates/base/dynamic_pagination/pagination_settings.html

@@ -1,17 +1,23 @@
-{% extends 'settings.html' %} {% block settings %}{% load i18n %}
+{% load i18n %}
 
 <form action="{% url 'pagination-settings-view' %}" class='settings-label mb-1' method="post">
   {% csrf_token %}
   <div class="oh-inner-sidebar-content__header mt-4">
-    <h2 class="oh-inner-sidebar-content__title">{% trans "Default records per page" %}</h2>
+    <h2 class="oh-inner-sidebar-content__title">{% trans "Default Records Per Page" %}</h2>
   </div>
-   {{form}}
-    <button
-      type="submit"
-      class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
+  <div class="oh-label__info" for="pagination">
+    <label class="oh-label" for="pagination">{% trans "Pagination" %}</label> 
+    <span class="oh-info mr-2" title='{% trans "Default pagination for all views." %}'>
+    </span>
+  </div>
+  <input type="number" name="pagination" value="{{pagination_form.instance.pagination}}" class="oh-input w-25" placeholder="Pagination" required="" id="id_pagination">
+  <button
+    style="display: inline;margin-left: 10px;"
+    type="submit"
+    class="oh-btn oh-btn--secondary mt-2 mr-0 oh-btn--w-100-resp"
     >
-      {% trans "Save Changes" %}
-    </button>
+    {% trans "Save Changes" %}
+  </button>
   <div class="oh-inner-sidebar-content__footer"></div>
 </form>
-{% endblock settings %}
+

base/templates/base/employee_type/type_view.html

@@ -4,7 +4,7 @@
 		<div class="oh-sticky-table__thead">
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Employee Type" %}</div>
-				<div class="oh-sticky-table__th"></div>
+				<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 			</div>
 		</div>
 		<div class="oh-sticky-table__tbody">

base/templates/base/general_settings.html

@@ -1,26 +1,39 @@
 {% extends 'settings.html' %} {% block settings %}{% load i18n %}
 
 {% if perms.recruitment.change_recruitmentgeneralsetting %}
-{% include "recruitment/settings/settings.html" %}
+    {% include "recruitment/settings/settings.html" %}
 {% endif %}
+
 {% if perms.offboarding.change_offboardinggeneralsetting %}
-{% include "offboarding/settings/settings.html" %}
+    {% include "offboarding/settings/settings.html" %}
 {% endif %}
+
 {% if perms.attendance.change_attendancegeneralsetting %}
-{% include "attendance/settings/settings.html" %}
+    {% include "attendance/settings/settings.html" %}
 {% endif %}
+
 {% if perms.payroll.change_payrollgeneralsetting %}
-{% include "payroll/settings/settings.html" %}
+    {% include "payroll/settings/settings.html" %}
 {% endif %}
+
 {% if perms.employee.change_employeegeneralsetting %}
-{% include "settings/settings.html" %}
+    {% include "settings/settings.html" %}
 {% endif %}
+
 {% if perms.base.change_announcementexpire %}
-{% include "announcement/expiry_day.html" %}
+    {% include "announcement/expiry_day.html" %}
 {% endif %}
+
 {% if perms.payroll.change_encashmentgeneralsetting %}
-{% include "settings/encashment_settings.html" %}
+    {% include "settings/encashment_settings.html" %}
 {% endif %}
+
 {% include "base/audit_tag/history_tracking_fields.html" %}
 {% include "base/audit_tag/employee_account_block_unblock.html" %}
+
+{% if perms.payroll.view_payrollsettings %}
+    {% include "payroll/settings/payroll_settings.html" %}
+{% endif %}
+
+{% include "base/dynamic_pagination/pagination_settings.html" %}
 {% endblock settings %}

base/templates/base/mail_server/mail_server_view.html

@@ -23,7 +23,7 @@
           <div class="oh-sticky-table__td">{{ server.company_id }}</div>
           <div class="oh-sticky-table__td">
             <div class="oh-btn-group">
-              <a hx-get="{% url 'mail-server-create-update' %}?instance_id={{ server.id }}" onclick="event.stopPropagation()" hx-target="#mailServerModalBody" data-toggle="oh-modal-toggle" data-target="#mailServerModal" class="oh-btn oh-btn--light-bkg w-50" title="Edit"><ion-icon name="create-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon></a>
+              <a hx-get="{% url 'mail-server-create-update' %}?instance_id={{ server.id }}" onclick="event.stopPropagation()" hx-target="#mailServerModalBody" data-toggle="oh-modal-toggle" data-target="#mailServerModal" class="oh-btn oh-btn--light-bkg w-100" title="Edit"><ion-icon name="create-outline" role="img" class="md hydrated" aria-label="create outline"></ion-icon></a>
               <a href="{% url 'mail-server-delete' %}?ids={{ server.id }}" onclick="event.stopPropagation(); return confirm('Do you want to delete this mail server configuration?');" type="submit" class="oh-btn oh-btn--danger-outline oh-btn--light-bkg w-100" title="Remove"><ion-icon name="trash-outline" role="img" class="md hydrated" aria-label="trash outline"></ion-icon></a>
             </div>
           </div>

base/templates/base/rotating_shift/rotating_shift_view.html

@@ -6,7 +6,7 @@
 				<div class="oh-sticky-table__th">{% trans "Title" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Shift 1" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Shift 2" %}</div>
-				<div class="oh-sticky-table__th"></div>
+				<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 			</div>
 		</div>
 		<div class="oh-sticky-table__tbody">

base/templates/base/rotating_work_type/rotating_work_type_view.html

@@ -7,7 +7,7 @@
 				<div class="oh-sticky-table__th">{% trans "Work Type 1" %}</div>
 				<div class="oh-sticky-table__th">{% trans "Work Type 2" %}</div>
 				{% if perms.base.change_rotatingworktype or perms.base.delete_rotatingworktype %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>

base/templates/base/shift/shift_view.html

@@ -10,7 +10,7 @@
 					<div class="oh-sticky-table__th">{% trans "Full Time" %}</div>
 					<div class="oh-sticky-table__th">{% trans "Grace Time" %}</div>
 					{% if perms.base.change_employeeshift or perms.base.delete_employeeshift %}
-						<div class="oh-sticky-table__th"></div>
+						<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 					{% endif %}
 				</div>
 			</div>

base/templates/base/work_type/work_type_view.html

@@ -5,7 +5,7 @@
 			<div class="oh-sticky-table__tr">
 				<div class="oh-sticky-table__th">{% trans "Work Type" %}</div>
 				{% if perms.base.change_worktype or perms.base.delete_worktype %}
-					<div class="oh-sticky-table__th"></div>
+					<div class="oh-sticky-table__th">{% trans "Actions" %}</div>
 				{% endif %}
 			</div>
 		</div>