From 8cdc9d682e6b8dc3bee6d39ee796d59a353268e7 Mon Sep 17 00:00:00 2001
From: Horilla <teamhorilla@gmail.com>
Date: Tue, 27 Feb 2024 23:46:03 +0530
Subject: [PATCH] [FIX] OFFBOARDING: Button positions

---
 .../offboarding/resignation/nav.html          |  2 +-
 .../resignation/request_cards.html            | 12 ++++----
 .../offboarding/resignation/request_list.html | 28 +++++++++++++++++++
 3 files changed, 35 insertions(+), 7 deletions(-)

diff --git a/offboarding/templates/offboarding/resignation/nav.html b/offboarding/templates/offboarding/resignation/nav.html
index 6ac129b7b..20caed343 100644
--- a/offboarding/templates/offboarding/resignation/nav.html
+++ b/offboarding/templates/offboarding/resignation/nav.html
@@ -93,7 +93,7 @@
 <div class="oh-modal" id="resignationModal" role="dialog" aria-hidden="true">
   <div class="oh-modal__dialog" style="max-width: 550px">
     <div class="oh-modal__dialog-header">
-      <button type="button" class="oh-modal__close" aria-label="Close"><ion-icon name="close-outline"></ion-icon></button>
+      <button type="button" class="oh-modal__close" aria-label="Close" style="z-index:1"><ion-icon name="close-outline"></ion-icon></button>
     </div>
 
     <div class="oh-modal__dialog-body oh-modal__dialog-relative" id="resignationModalBody"></div>
diff --git a/offboarding/templates/offboarding/resignation/request_cards.html b/offboarding/templates/offboarding/resignation/request_cards.html
index 82a97589b..e373d70ee 100644
--- a/offboarding/templates/offboarding/resignation/request_cards.html
+++ b/offboarding/templates/offboarding/resignation/request_cards.html
@@ -71,12 +71,6 @@
     <form action="{% url 'update-letter-status' %}">
       {% if perms.offboarding.change_resignationletter %}
       <div class="oh-btn-group">
-        <button type="button"
-          onclick="$(this).closest('form').find('input[name=status]').val('rejected');resignLetterConfirmation('{% trans 'Do You really want to reject the request?' %}',$(this).closest('form').find('[type=submit]'));"
-          class="oh-btn oh-btn--danger oh-btn--block w-100">
-          <ion-icon name="close-circle-outline" class="mr-1 md hydrated" role="img" aria-label="close"></ion-icon>
-          {% comment %} {% trans 'Reject' %} {% endcomment %}
-        </button>
         {% if record.status != "approved" %}
         <button title="By approving the request employee will added to the offboarding pipeline" type="button"
           onclick="$(this).closest('form').find('input[name=status]').val('approved');resignLetterConfirmation('{% trans 'Do You really want to approve the request' %}?',$(this).closest('form').find('[type=submit]'),true);"
@@ -90,6 +84,12 @@
           {% comment %} {% trans 'Approved' %} {% endcomment %}
         </button>
         {% endif %}
+        <button type="button"
+          onclick="$(this).closest('form').find('input[name=status]').val('rejected');resignLetterConfirmation('{% trans 'Do You really want to reject the request?' %}',$(this).closest('form').find('[type=submit]'));"
+          class="oh-btn oh-btn--danger oh-btn--block w-100">
+          <ion-icon name="close-circle-outline" class="mr-1 md hydrated" role="img" aria-label="close"></ion-icon>
+          {% comment %} {% trans 'Reject' %} {% endcomment %}
+        </button>
         <input type="hidden" name="status">
         <input type="hidden" name="letter_ids" value="{{record.id}}">
         <input type="hidden" name="offboarding_id">
diff --git a/offboarding/templates/offboarding/resignation/request_list.html b/offboarding/templates/offboarding/resignation/request_list.html
index 0e9609e63..9ae1e0cb4 100644
--- a/offboarding/templates/offboarding/resignation/request_list.html
+++ b/offboarding/templates/offboarding/resignation/request_list.html
@@ -82,6 +82,9 @@
                     </div>
                     <div class="oh-sticky-table__th oh-sticky-table__right">
                         {% trans "Actions" %}
+                    </div>                    
+                    <div class="oh-sticky-table__th oh-sticky-table__right">
+                        {% trans "Confirmation" %}
                     </div>
                 </div>
             </div>
@@ -108,6 +111,31 @@
                     <div data-cell-index="4" class="oh-sticky-table__td">
                         {{letter.description|safe|truncatechars:30}}
                     </div>
+                    <div class="oh-sticky-table__td" onclick="event.stopPropagation()">
+                        <div class="oh-btn-group">
+                            {% if perms.offboarding.change_resignationletter %}
+                            <button type="button" hx-get="{% url 'send-mail-employee' letter.employee_id.id %}" 
+                              title="{% trans " Send Mail" %}" hx-target="#resignationModalBody" class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle"
+                              data-target="#resignationModal" style="flex: 1 0 auto; width: 40px; height: 40.68px; padding: 0"
+                              onclick="event.stopPropagation()"><ion-icon name="mail-open-outline" role="img" class="md hydrated"
+                                aria-label="mail open outline"></ion-icon>
+                            </button>
+                            {% endif %}
+                  
+                            <a hx-get="{% url 'create-resignation-request' %}?instance_id={{ letter.id }}" title = {% trans "Edit" %}
+                              class="oh-btn oh-btn--light" data-toggle="oh-modal-toggle" hx-target="#resignationModalBody"
+                              data-target="#resignationModal" style="flex: 1 0 auto; width: 40px; height: 40.68px; padding: 0"><ion-icon
+                                class="text-dark md hydrated" name="create-outline" role="img" aria-label="create outline"></ion-icon></a>
+                            {% if perms.offboarding.delete_resignationletter %}
+                            <a href="{% url 'delete-resignation-request' %}?letter_ids={{letter.id}}" class="oh-btn oh-btn--light" 
+                              title = {%trans "Delete" %} style="flex: 1 0 auto; width: 40px; height: 40.68px; padding: 0"
+                              onclick="return confirm('{% trans 'Do you want to delete this record' %}?')"><ion-icon
+                                class="text-danger md hydrated" name="trash-outline" role="img" aria-label="trash outline"></ion-icon>
+                            </a>
+                            {% endif %}
+                  
+                          </div>
+                    </div>
                     <div class="oh-sticky-table__td oh-sticky-table__right">
                         <form action="{% url 'update-letter-status' %}">
                             {% if perms.offboarding.change_resignationletter %}