Filtering Fix

dbca-wa · Feb 28, 2024 · d944751 · d944751
1 parent 9c3d720
commit d944751
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 7 deletions.
diff --git a/ledger/payments/api.py b/ledger/payments/api.py
@@ -1115,7 +1115,7 @@ def PaymentTotals(request, *args, **kwargs):
             # if len(status) > 0:
             #     query &= Q(status=status)
             # if len(system) > 0:
-            #     query &= Q(system_identifier__system_id=system)
+            query &= Q(oracle_system__system_id=system)
             if len(settlement_date) > 0:
 
                 settlement_date_django = datetime.strptime(settlement_date, "%d/%m/%Y")

diff --git a/ledger/payments/static/payments/js/ledger_payments.js b/ledger/payments/static/payments/js/ledger_payments.js
@@ -261,13 +261,15 @@ var ledger_payments = {
                             var pstart = 0;
                             var pend = 0 + pagelimit;
                             for (let i = 1; i <= totalpages; i++) {
-                                pages+='<li class="page-item ';
-                                if (ledger_payments.var.pagestart == pstart && ledger_payments.var.pageend == pend) { 
-                                   pages+=' active';
+                                if (i < 40) {
+                                        pages+='<li class="page-item ';
+                                        if (ledger_payments.var.pagestart == pstart && ledger_payments.var.pageend == pend) { 
+                                        pages+=' active';
+                                        }
+                                        pages+= '"><a class="page-link" href="javascript:void(0);" onclick="ledger_payments.update_page_payment_totals('+pstart+','+pend+');">'+i+'</a></li>';
+                                        pstart = pstart + pagelimit;
+                                        pend = pend + pagelimit;
                                 }
-                                pages+= '"><a class="page-link" href="javascript:void(0);" onclick="ledger_payments.update_page_payment_totals('+pstart+','+pend+');">'+i+'</a></li>';
-                                pstart = pstart + pagelimit;
-                                pend = pend + pagelimit;
                             }
                             //    pages+='<li class="page-item active">';
                             //    pages+='<a class="page-link" href="#">2</a>';