nestict/ihrm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[UPDT]sidebar menu fix

Browse Source
This commit is contained in:
Horilla
2023-08-31 16:58:57 +05:30
parent defdd7a1d0
commit 07137670a0
4 changed files with 8 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
attendance/templates/attendance/own_attendance/attendances.html
View File

@@ -15,7 +15,6 @@
<div class="oh-sticky-table__th" hx-target='#attendance-container' hx-get="{% url 'own-attendance-filter' %}?{{pd}}&orderby=">{% trans "Min Hour" %}</div>
<div class="oh-sticky-table__th" hx-target='#attendance-container' hx-get="{% url 'own-attendance-filter' %}?{{pd}}&orderby=at_work_second">{% trans "At Work" %}</div>
<div class="oh-sticky-table__th" hx-target='#attendance-container' hx-get="{% url 'own-attendance-filter' %}?{{pd}}&orderby=overtime_second">{% trans "Overtime" %}</div>
<div class="oh-sticky-table__th"></div>
</div>
</div>
<div class="oh-sticky-table__tbody">
@@ -67,11 +66,6 @@
<div class="oh-sticky-table__td">
{{attendance.attendance_overtime}}
</div>
<div class="oh-sticky-table__td">
{% if attendance.attendance_validated == True %}
<a href="/attendance/revalidate-this-attendance/{{attendance.id}}/"class='oh-btn oh-btn--info'>{% trans "Revalidate" %}</a>
{% endif %}
</div>
</div>
{% endfor %}

2
attendance/templates/requests/attendance/request_lines.html
View File

@@ -63,7 +63,7 @@
<div class="oh-sticky-table__td {% if 'attendance_day' in attendance.requested_fields or attendance.request_type == 'create_request' %} diff-cell{% endif %}" >
{{attendance.attendance_day|capfirst}}
</div>
<div class="oh-sticky-table__td {% if 'atteendance_clock_in' in attendance.requested_fields or attendance.request_type == 'create_request' %} diff-cell{% endif %}" >
<div class="oh-sticky-table__td {% if 'attendance_clock_in' in attendance.requested_fields or attendance.request_type == 'create_request' %} diff-cell{% endif %}" >
{{attendance.attendance_clock_in}}
</div>
<div class="oh-sticky-table__td {% if 'attendance_clock_in_date' in attendance.requested_fields or attendance.request_type == 'create_request' %} diff-cell{% endif %}" >

1
attendance/urls.py
View File

@@ -13,7 +13,6 @@ import attendance.views.requests
from .views import views
urlpatterns = [
path("get-language-code/", views.get_language_code, name="get-language-code"),
path("attendance-create", views.attendance_create, name="attendance-create"),
path("attendance-view", views.attendance_view, name="attendance-view"),
path(

9
templates/sidebar.html
View File

@@ -84,6 +84,11 @@
</a>
<div class="oh-sidebar__submenu" id="onboardingNav" style="display: none;" x-show="isOpen" x-transition style="display: none;">
<ul class="oh-sidebar__submenu-items">
{% if perms.onboarding.view_dashboard %}
<li class="oh-sidebar__submenu-item">
<a href="{%url 'view-onboarding-dashboard' %}" class="oh-sidebar__submenu-link">{% trans "Dashboard" %}</a>
</li>
{% endif %}
{% if request.user|is_taskmanager or perms.onboarding.view_candidatestage %}
<li class="oh-sidebar__submenu-item">
<a href="{% url 'onboarding-view' %}" class="oh-sidebar__submenu-link">{% trans "Onboarding View" %}</a>
@@ -185,11 +190,11 @@
{% if perms.attendance.view_attendance or request.user|is_reportingmanager %}
<li class="oh-sidebar__submenu-item">
<a class="oh-sidebar__submenu-link" href="{% url 'attendance-view' %}">{% trans "Attendance" %}</a>
</li>
</li>{% endif %}
<li class="oh-sidebar__submenu-item">
<a class="oh-sidebar__submenu-link" href="{% url 'request-attendance-view' %}">{% trans "Attendance Requests" %}</a>
</li>
{% endif %} {% if perms.attendance.view_attendanceovertime or request.user|is_reportingmanager %}
{% if perms.attendance.view_attendanceovertime or request.user|is_reportingmanager %}
<li class="oh-sidebar__submenu-item">
<a class="oh-sidebar__submenu-link" href="{% url 'attendance-overtime-view' %}">{% trans "Hour Account" %}</a>
</li>