From 8083e676e33ea8036dbf084cbd5b37fdea335e34 Mon Sep 17 00:00:00 2001 From: Horilla Date: Tue, 3 Sep 2024 14:10:49 +0530 Subject: [PATCH] [UPDT] HORILLA CRUMBS: Additional urls to sidebar urls list --- attendance/urls.py | 2 +- base/translator.py | 11 +++++++++++ employee/not_in_out_dashboard.py | 23 +++++++++++------------ horilla_crumbs/context_processors.py | 11 +++++++++++ leave/urls.py | 4 ++-- payroll/urls/component_urls.py | 2 +- payroll/urls/tax_urls.py | 4 +++- payroll/urls/urls.py | 2 +- recruitment/urls.py | 6 +++--- templates/index.html | 2 +- 10 files changed, 45 insertions(+), 22 deletions(-) diff --git a/attendance/urls.py b/attendance/urls.py index 94c03dfe8..e82eae859 100644 --- a/attendance/urls.py +++ b/attendance/urls.py @@ -424,7 +424,7 @@ urlpatterns = [ name="attendance-settings-view", ), path( - "track-late-come-early-out", + "track-late-come-early-out/", views.track_late_come_early_out, name="track-late-come-early-out", ), diff --git a/base/translator.py b/base/translator.py index c1628d952..c5b075082 100644 --- a/base/translator.py +++ b/base/translator.py @@ -331,3 +331,14 @@ _("view-meetings"), _("view-key-result"), _("asset-history"), _("restrict-view"), +_("auto-payslip-settings-view"), +_("bonus-point-setting"), +_("employee-past-leave-restriction"), +_("track-late-come-early-out"), +_("enable-biometric-attendance"), +_("allowed-ips"), +_("self-tracking-feature"), +_("candidate-reject-reasons"), +_("skills-view"), +_("employee-bonus-point"), +_("mail-automations"), diff --git a/employee/not_in_out_dashboard.py b/employee/not_in_out_dashboard.py index e7a417036..c560e0fd2 100644 --- a/employee/not_in_out_dashboard.py +++ b/employee/not_in_out_dashboard.py @@ -16,7 +16,7 @@ from django.http import HttpResponse, JsonResponse from django.shortcuts import render from base.backends import ConfiguredEmailBackend -from base.methods import generate_pdf +from base.methods import export_data, generate_pdf from base.models import HorillaMailTemplate from employee.filters import EmployeeFilter from employee.models import Employee @@ -92,17 +92,6 @@ def send_mail(request, emp_id=None): ) -from attendance.filters import AttendanceFilters -from attendance.forms import AttendanceExportForm -from attendance.models import Attendance -from base.methods import export_data -from leave.filters import LeaveRequestFilter -from leave.forms import LeaveRequestExportForm -from leave.models import LeaveRequest -from payroll.filters import PayslipFilter -from payroll.forms.component_forms import PayslipExportColumnForm - - @login_required @manager_can_enter("employee.change_employee") def employee_data_export(request, emp_id=None): @@ -124,6 +113,9 @@ def employee_data_export(request, emp_id=None): # IF LEAVE IS INSTALLED if apps.is_installed("leave"): + from leave.filters import LeaveRequestFilter + from leave.forms import LeaveRequestExportForm + excel_column = LeaveRequestExportForm() export_filter = LeaveRequestFilter() context.update( @@ -135,6 +127,10 @@ def employee_data_export(request, emp_id=None): # IF ATTENDANCE IS INSTALLED if apps.is_installed("attendance"): + from attendance.filters import AttendanceFilters + from attendance.forms import AttendanceExportForm + from attendance.models import Attendance + excel_column = AttendanceExportForm() export_filter = AttendanceFilters() context.update( @@ -146,6 +142,9 @@ def employee_data_export(request, emp_id=None): # IF PAYROLL IS INSTALLED if apps.is_installed("payroll"): + from payroll.filters import PayslipFilter + from payroll.forms.component_forms import PayslipExportColumnForm + context.update( { "payroll_export_column": PayslipExportColumnForm(), diff --git a/horilla_crumbs/context_processors.py b/horilla_crumbs/context_processors.py index 781b67cb1..b7f9daf22 100644 --- a/horilla_crumbs/context_processors.py +++ b/horilla_crumbs/context_processors.py @@ -135,6 +135,17 @@ sidebar_urls = [ "objective-detailed-view", "mail-automations", "faq-view", + "auto-payslip-settings-view", + "bonus-point-setting", + "employee-past-leave-restriction", + "track-late-come-early-out", + "enable-biometric-attendance", + "allowed-ips", + "self-tracking-feature", + "candidate-reject-reasons", + "skills-view", + "employee-bonus-point", + "mail-automations", ] remove_urls = [ "feedback-detailed-view", diff --git a/leave/urls.py b/leave/urls.py index a3eff03c0..6365fa335 100644 --- a/leave/urls.py +++ b/leave/urls.py @@ -319,7 +319,7 @@ urlpatterns = [ "view-clashes//", views.view_clashes, name="view-clashes" ), path( - "compensatory-leave-settings-view", + "compensatory-leave-settings-view/", views.compensatory_leave_settings_view, name="compensatory-leave-settings-view", ), @@ -329,7 +329,7 @@ urlpatterns = [ name="enable-compensatory-leave", ), path( - "employee-past-leave-restriction", + "employee-past-leave-restriction/", views.employee_past_leave_restriction, name="employee-past-leave-restriction", ), diff --git a/payroll/urls/component_urls.py b/payroll/urls/component_urls.py index 763fffdc2..105c05e3b 100644 --- a/payroll/urls/component_urls.py +++ b/payroll/urls/component_urls.py @@ -114,7 +114,7 @@ urlpatterns = [ name="asset-fine", ), path( - "view-reimbursement", + "view-reimbursement/", component_views.view_reimbursement, name="view-reimbursement", ), diff --git a/payroll/urls/tax_urls.py b/payroll/urls/tax_urls.py index 35aa612b5..1d62419d3 100644 --- a/payroll/urls/tax_urls.py +++ b/payroll/urls/tax_urls.py @@ -9,7 +9,9 @@ from django.urls import path from payroll.views import tax_views urlpatterns = [ - path("filing-status-view", tax_views.filing_status_view, name="filing-status-view"), + path( + "filing-status-view/", tax_views.filing_status_view, name="filing-status-view" + ), path( "create-filing-status", tax_views.create_filing_status, diff --git a/payroll/urls/urls.py b/payroll/urls/urls.py index bd755d519..e376a6dee 100644 --- a/payroll/urls/urls.py +++ b/payroll/urls/urls.py @@ -168,7 +168,7 @@ urlpatterns = [ ), # ===========================Auto payslip generate================================ path( - "auto-payslip-settings-view", + "auto-payslip-settings-view/", views.auto_payslip_settings_view, name="auto-payslip-settings-view", ), diff --git a/recruitment/urls.py b/recruitment/urls.py index eaab90762..61627a213 100644 --- a/recruitment/urls.py +++ b/recruitment/urls.py @@ -532,7 +532,7 @@ urlpatterns = [ name="check-vaccancy", ), path( - "settings/skills-view/", + "skills-view/", views.skills_view, name="skills-view", ), @@ -572,7 +572,7 @@ urlpatterns = [ name="matching-resume-completion", ), path( - "settings/candidate-reject-reasons/", + "candidate-reject-reasons/", views.candidate_reject_reasons, name="candidate-reject-reasons", ), @@ -582,7 +582,7 @@ urlpatterns = [ name="hired-candidate-chart", ), path( - "self-tracking-feature", + "self-tracking-feature/", views.self_tracking_feature, name="self-tracking-feature", ), diff --git a/templates/index.html b/templates/index.html index c9f5cca08..0dd9c8377 100755 --- a/templates/index.html +++ b/templates/index.html @@ -378,7 +378,7 @@ } } - {% if "leave"|app_installed %} + {% if "leave"|app_installed and "payroll"|app_installed %} function getAssignedLeave(employeeElement) { var employeeId=employeeElement.val() $.ajax({