[UPDT] PAYROLL: Add data-action=delete attribute for delete option in navnbar

payroll/models/models.py

@@ -113,6 +113,9 @@ class FilingStatus(HorillaModel):
     def __str__(self) -> str:
         return str(self.filing_status)
 
+    class Meta:
+        ordering = ["-id"]
+
 
 class Contract(HorillaModel):
     """

payroll/static/payroll/action.js

@@ -22,11 +22,11 @@ var deleteContractMessages = {
   fr: "Voulez-vous vraiment supprimer tous les contrats sélectionnés?",
 };
 
-var noRowMessages = {
+var noRowPayrollMessages = {
   ar: "لم يتم تحديد أي صفوف.",
   de: "Es wurden keine Zeilen ausgewählt.",
   es: "No se han seleccionado filas.",
-  en: "No rows have been selected.",
+  en: "No rows have been selected to delete.",
   fr: "Aucune ligne n'a été sélectionnée.",
 };
 
@@ -291,7 +291,7 @@ function exportPayslips() {
   getCurrentLanguageCode(function (code) {
     languageCode = code;
     var confirmMessage = excelMessages[languageCode];
-    var textMessage = noRowMessages[languageCode];
+    var textMessage = noRowPayrollMessages[languageCode];
     if (ids.length === 0) {
       Swal.fire({
         text: textMessage,
@@ -346,7 +346,7 @@ $("#deletePayslipBulk").click(function (e) {
   getCurrentLanguageCode(function (code) {
     languageCode = code;
     var confirmMessage = deletePayslipMessages[languageCode];
-    var textMessage = noRowMessages[languageCode];
+    var textMessage = noRowPayrollMessages[languageCode];
     var checkedRows = $(".payslip-checkbox").filter(":checked");
     ids = [];
     ids.push($("#selectedPayslip").attr("data-ids"));
@@ -590,7 +590,7 @@ function exportContractRequest() {
   getCurrentLanguageCode(function (code) {
     languageCode = code;
     var confirmMessage = excelMessages[languageCode];
-    var textMessage = noRowMessages[languageCode];
+    var textMessage = noRowPayrollMessages[languageCode];
     if (ids.length === 0) {
       Swal.fire({
         text: textMessage,
@@ -645,7 +645,7 @@ $("#DeleteContractBulk").click(function (e) {
   getCurrentLanguageCode(function (code) {
     languageCode = code;
     var confirmMessage = deleteContractMessages[languageCode];
-    var textMessage = noRowMessages[languageCode];
+    var textMessage = noRowPayrollMessages[languageCode];
     ids = [];
     ids.push($("#selectedInstances").attr("data-ids"));
     ids = JSON.parse($("#selectedInstances").attr("data-ids"));

payroll/templates/payroll/contract/contract_view.html

@@ -158,11 +158,7 @@
                             {% endif %}
                             {% if perms.contract.delete_contract %}
                             <li class="oh-dropdown__item">
-                                <a
-                                    class="oh-dropdown__link oh-dropdown__link--danger"
-                                    id="DeleteContractBulk"
-                                    >{% trans "Delete" %}</a
-                                >
+                                <a id="DeleteContractBulk" data-action="delete" class="oh-dropdown__link oh-dropdown__link--danger" >{% trans "Delete" %}</a>
                             </li>
                             {% endif %}
                         </ul>

payroll/templates/payroll/payslip/view_payslips.html

@@ -248,6 +248,7 @@
                 <li class="oh-dropdown__item">
                   <a
                     class="oh-dropdown__link oh-dropdown__link--danger"
+                    data-action="delete"
                     id="deletePayslipBulk"
                     >{% trans "Delete" %}</a
                   >