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

[ADD] BASE: Employee notifications and announcement design change for mentions

Browse Source
This commit is contained in:
Horilla
2024-02-01 13:03:44 +05:30
parent 74ab7460a0
commit fb9e360679
3 changed files with 65 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
base/announcement.py
View File

@@ -212,6 +212,12 @@ def create_announcement_comment(request, anoun_id):
form = AnnouncementcommentForm(
initial={"employee_id": emp.id, "request_id": anoun_id}
)
comments = AnnouncementComment.objects.filter(announcement_id = anoun_id)
commentators = []
if comments:
for i in comments:
commentators.append(i.employee_id.employee_user_id)
unique_users = list(set(commentators))
if request.method == "POST":
form = AnnouncementcommentForm(request.POST)
@@ -223,6 +229,17 @@ def create_announcement_comment(request, anoun_id):
initial={"employee_id": emp.id, "request_id": anoun_id}
)
messages.success(request, _("You commented a post."))
notify.send(
request.user.employee_get,
recipient=unique_users,
verb=f"Comment under the announcement {anoun.title}.",
verb_ar=f"تعليق تحت الإعلان {anoun.title}.",
verb_de=f"Kommentar unter der Ankündigung {anoun.title}.",
verb_es=f"Comentario bajo el anuncio {anoun.title}.",
verb_fr=f"Commentaire sous l'annonce {anoun.title}.",
redirect="/",
icon="chatbox-ellipses",
)
return HttpResponse("<script>window.location.reload()</script>")
return render(
request,

59
base/templates/announcement/announcement_one.html
View File

@@ -73,28 +73,6 @@
<p class="card-text">{{ anoun.description|safe }}</p>
</div>
{% if anoun.department.all %}
<div class="card-footer mb-3">
<u><span class='card-text fw-bold mb-1'>{% trans "Departments" %}</span></u>
<div style= "display: flex; flex-wrap: wrap;">
{% for dep in anoun.department.all %}
<i><span class="mr-2 fw-bold text-secondary">#{{ dep.department }}</span></i>
{% endfor %}
</div>
</div>
{% endif %}
{% if anoun.job_position.all %}
<div class="card-footer mb-3">
<u><span class='card-text fw-bold mb-1'>{% trans "Jobpositions" %}</span></u>
<div style= "display: flex; flex-wrap: wrap;">
{% for job in anoun.job_position.all %}
<i><span class="mr-2 fw-bold text-secondary">#{{ job.job_position }}</span></i>
{% endfor %}
</div>
</div>
{% endif %}
<div class="card-footer">
{% for attachment in anoun.attachments.all %}
@@ -114,7 +92,15 @@
<div class="card-footer mt-2">
<div class="oh-announcement__comment-view">
{% if anoun.department.all or anoun.job_position.all %}
<button class="oh-btn me-1 oh-announcement-btn" type="button" onmouseover="showDetails()" onmouseout="hideDetails()">
<ion-icon name="information"></ion-icon>
</button>
{% endif %}
<button class="oh-btn me-1 oh-announcement-btn" hx-get='{% url "announcement-add-comment" anoun.id %}' type="button" title="Add Comment" hx-target="#commentForm"
hx-swap="innerHTML" data-toggle="oh-modal-toggle" data-target="#commentModal">
<ion-icon name="chatbox-outline" class="md hydrated" role="img" aria-label="chevron back outline"></ion-icon>
@@ -124,8 +110,33 @@
<ion-icon name="eye-outline" class="md hydrated" role="img" aria-label="chevron back outline"></ion-icon>
</button>
</div>
</div>
<div id="infoDiv" style="display:none;">
{% if anoun.department.all %}
<div class="oh-announcement-hastag__container" style="z-index:1000">
<span class="oh-announcement-hashtags" style="font-size:0.8rem;">{% trans "Department" %}</span>
<div class="oh-announcement-hashtags">
{% for dep in anoun.department.all %}
<span class="oh-announcement__tags">#{{ dep.department }}</span>
{% endfor %}
</div>
</div>
{% endif %}
{% if anoun.job_position.all %}
<div class="oh-announcement-hastag__container">
<span class="oh-announcement-hashtags" style="font-size:0.8rem;">{% trans "Job Position" %}</span>
<div class="oh-announcement-hashtags">
{% for job in anoun.job_position.all %}
<span class="oh-announcement__tags">#{{ job.job_position }}</span>
{% endfor %}
</div>
</div>
{% endif %}
</div>
</div>
{% endfor %}
{% endfor %}

13
templates/announcement_single_view.html
View File

@@ -168,3 +168,16 @@ aria-hidden="true"
</div>
<!-- end of comment view modal -->
<script>
function showDetails() {
var infoDiv = document.getElementById("infoDiv");
infoDiv.style.display = "block";
}
function hideDetails() {
var infoDiv = document.getElementById("infoDiv");
infoDiv.style.display = "none";
}
</script>