diff --git a/employee/models.py b/employee/models.py index 3b7471fa8..a97dcc2ba 100644 --- a/employee/models.py +++ b/employee/models.py @@ -382,6 +382,7 @@ class Employee(models.Model): user.user_permissions.add(view_ownprofile) user.user_permissions.add(change_ownprofile) return self.save() + return self diff --git a/employee/templates/related_models.html b/employee/templates/related_models.html index f0fdafd27..1e041cdb0 100644 --- a/employee/templates/related_models.html +++ b/employee/templates/related_models.html @@ -12,7 +12,7 @@ style="display: flex; justify-content: center" > {% trans "Can't Archive" %} + >{{title}}
diff --git a/employee/urls.py b/employee/urls.py index 9d5bd88e5..f9a081934 100644 --- a/employee/urls.py +++ b/employee/urls.py @@ -3,6 +3,7 @@ urls.py This module is used to map url path with view methods. """ + from django.urls import path from base.views import object_delete from employee import not_in_out_dashboard, policies, views @@ -352,7 +353,20 @@ urlpatterns = [ views.encashment_condition_create, name="encashment-condition-create", ), - path("initial-prefix",views.initial_prefix,name="initial-prefix"), - path("get-first-last-badge-id",views.first_last_badge,name="get-first-last-badge-id"), - path("employee-get-mail-log",views.employee_get_mail_log,name="employee-get-mail-log"), + path("initial-prefix", views.initial_prefix, name="initial-prefix"), + path( + "get-first-last-badge-id", + views.first_last_badge, + name="get-first-last-badge-id", + ), + path( + "employee-get-mail-log", + views.employee_get_mail_log, + name="employee-get-mail-log", + ), + path( + "get-manage-in", + views.get_manager_in, + name="get-manager-in", + ), ] diff --git a/employee/views.py b/employee/views.py index 37cd0e190..5145f8bde 100755 --- a/employee/views.py +++ b/employee/views.py @@ -1850,15 +1850,42 @@ def employee_archive(request, obj_id): if save: employee.save() messages.success(request, message) - return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) + key = "HTTP_HX_REQUEST" + if key not in request.META.keys(): + return HttpResponseRedirect(request.META.get("HTTP_REFERER", "/")) + else: + return HttpResponse("") else: return render( request, "related_models.html", - {"employee": employee, "related_models": result.get("related_models")}, + { + "employee": employee, + "related_models": result.get("related_models"), + "title": _("Cant't Archive"), + }, ) +@login_required +@permission_required("employee.view_employee") +def get_manager_in(request): + """ + This method is used to get the manager in records model + """ + employee_id = request.GET.get("employee_id") + employee = Employee.objects.filter(id=employee_id).first() + return render( + request, + "related_models.html", + { + "employee": employee, + "related_models": employee.get_archive_condition().get("related_models"), + "title": _("Assigned In"), + }, + ) + + @login_required @manager_can_enter("employee.view_employee") def employee_search(request): diff --git a/offboarding/templates/offboarding/pipeline/offboardings.html b/offboarding/templates/offboarding/pipeline/offboardings.html index 32a8da4f8..92bae095f 100644 --- a/offboarding/templates/offboarding/pipeline/offboardings.html +++ b/offboarding/templates/offboarding/pipeline/offboardings.html @@ -56,6 +56,7 @@ } +
diff --git a/offboarding/templates/offboarding/stage/offboarding_body.html b/offboarding/templates/offboarding/stage/offboarding_body.html index eaacf84f6..600d999cf 100644 --- a/offboarding/templates/offboarding/stage/offboarding_body.html +++ b/offboarding/templates/offboarding/stage/offboarding_body.html @@ -60,7 +60,7 @@ {% if request.user.employee_get|is_any_stage_manager or perms.offboarding.change_offboarding or perms.offboarding.change_offboardingemployee %}
{% trans "Stage" %}
{% endif %} -
{% trans "Actions" %}
+
{% trans "Actions" %}
{% for task in stage.grouper.offboardingtask_set.all %}
diff --git a/offboarding/templates/offboarding/task/table_body.html b/offboarding/templates/offboarding/task/table_body.html index 5e0573685..cae5a0057 100644 --- a/offboarding/templates/offboarding/task/table_body.html +++ b/offboarding/templates/offboarding/task/table_body.html @@ -69,11 +69,12 @@ > - {% if not employee.employee_id.is_active %} + {% if stage.grouper.type == "archived" %} - {% endif %} {% if perms.offboarding.delete_offboardingemployee %} + {% endif %} + {% if employee.employee_id.get_archive_condition %} + + {% endif %} + {% if perms.offboarding.delete_offboardingemployee %}