[UPDT] RECRUITMENT: Sage manager removal bug fix, candidate and skill zone style change

This commit is contained in:
Horilla
2024-03-21 15:39:57 +05:30
parent 0dd612f165
commit 4c231dd4e0
6 changed files with 53 additions and 20 deletions

View File

@@ -17,18 +17,6 @@
</style>
{% if messages %}
<div class="oh-wrapper">
{% for message in messages %}
<div class="oh-alert-container">
<div class="oh-alert oh-alert--animated {{message.tags}}">
{{ message }}
</div>
</div>
{% endfor %}
</div>
{% endif %}
{% include 'filter_tags.html' %}
{% if data %}

View File

@@ -118,8 +118,20 @@
class="oh-sticky-table__td">{{cand.recruitment_id}}</a>
<a data-cell-index="5" href="{% url 'candidate-view-individual' cand.id %}" style="color: inherit;text-decoration: none;"
class="oh-sticky-table__td">{{cand.job_position_id}}</a>
<a data-cell-index="6" style="color: inherit;text-decoration: none;" class="oh-sticky-table__td" href="/media/{{cand.resume}}"
target="_blank" rel="noopener noreferrer"><span class="oh-btn oh-btn--info"> {% trans "Resume" %}</span></a>
<div data-cell-index="6" class="oh-sticky-table__td " onclick="event.stopPropagation()">
<a
style="text-decoration: none"
class="oh-btn oh-btn--light"
href="/media/{{cand.resume}}"
target="_blank"
title="{% trans 'Resume' %}"
rel="noopener noreferrer"
>
<span class="oh-file-icon oh-file-icon--pdf"></span> &nbsp {% trans "View" %}
</a>
</div>
<div class="oh-sticky-table__td">
{% if perms.recruitment.change_candidate %}
<div class="oh-btn-group">

View File

@@ -127,9 +127,9 @@
target="_blank"
title="{% trans 'Resume' %}"
rel="noopener noreferrer"
style="flex: 1 0 auto; width:20px;height: 40.68px; padding: 0;"
><ion-icon name="document-outline"></ion-icon
></a>
>
<span class="oh-file-icon oh-file-icon--pdf"></span> &nbsp {% trans "View" %}
</a>
</div>
<div class="oh-sticky-table__td " onclick="event.stopPropagation()">
<div class="oh-btn-group">

View File

@@ -123,7 +123,8 @@
</div>
<button hx-post="{% url 'rec-remove-stage-manager' manager.id stage.id %}?{{pd}}&page={{data.number}}"
hx-target='#stage-container' class="oh-user-panel__remove"
title="{% trans "Remove" %}">
hx-confirm='{% trans "Are sure want to remove this manager?" %}'
title='{% trans "Remove" %}'>
<ion-icon name="close-outline"></ion-icon>
</button>
</span>

View File

@@ -1,5 +1,24 @@
{% load i18n %}{% load static %}
<!-- start of messages -->
{% if messages %}
<div class="oh-wrapper">
{% for message in messages %}
<div class="oh-alert-container">
<div class="oh-alert oh-alert--animated {{message.tags}}">
{{ message }}
</div>
</div>
{% endfor %}
<script>
setTimeout(function () {
$(".oh-modal__close").click();
}, 1000);
</script>
</div>
{% endif %}
<!-- end of messages -->
<!-- start of quick filters -->
<div class="d-flex flex-row-reverse">
<span class="m-1"

View File

@@ -13,10 +13,13 @@ from django.utils.translation import gettext_lazy as _
from django.utils.translation import gettext as __
from django.views.decorators.http import require_http_methods
from django.shortcuts import render, redirect
from attendance.methods.group_by import group_by_queryset
from employee.models import Employee
from horilla.decorators import login_required, permission_required
from recruitment.decorators import manager_can_enter, recruitment_manager_can_enter
from notifications.signals import notify
from recruitment.filters import StageFilter
from recruitment.forms import StageCreationForm
from recruitment.models import Candidate, Recruitment, Stage, StageNote
from recruitment.views.paginator_qry import paginator_qry
@@ -302,11 +305,21 @@ def remove_stage_manager(request, mid, sid):
stage_obj.stage_managers.remove(manager)
messages.success(request, _("Stage manager removed successfully."))
stages = Stage.objects.all()
stages = stages.filter(recruitment_id__is_active=True)
recruitments = group_by_queryset(
stages,
"recruitment_id",
request.GET.get("rpage"),
)
filter_obj = StageFilter()
form = StageCreationForm()
previous_data = request.GET.urlencode()
return render(
request,
"stage/stage_component.html",
{"data": paginator_qry(stages, request.GET.get("page")), "pd": previous_data},
"stage/stage_group.html",
{"data": paginator_qry(stages, request.GET.get("page")), "pd": previous_data, "form": form,
"f": filter_obj,
"recruitments": recruitments,},
)