From 7cf773cc23918b5a5672caa0c659e91204153615 Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 16:46:42 +0300
Subject: [PATCH 01/10] tune parking icon fills

---
 .../fastparking/parking/templates/parking/parking_plan.html   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FRONTEND/fastparking/parking/templates/parking/parking_plan.html b/FRONTEND/fastparking/parking/templates/parking/parking_plan.html
index 9c227274..0df2a8fc 100644
--- a/FRONTEND/fastparking/parking/templates/parking/parking_plan.html
+++ b/FRONTEND/fastparking/parking/templates/parking/parking_plan.html
@@ -14,9 +14,9 @@ <h3>Total number of parking spaces: {{ parking_spaces.count }}, including free s
   </div>
 </div>
 <div class="container-fluid">
-  <div class="row row-cols-auto pt-4 mt-3 border rounded bg-light">
+  <div class="row row-cols-auto gy-3 pt-1 pb-3 mt-3 border rounded bg-light">
     {% for entry in parking_spaces %}
-    <div class="col-xl-1 mb-3">
+    <div class="col-xl-1">
       <div class="card parking_place{% if entry.owner_number %} parking_place_users{% endif %}">
         {% if entry.status %}
           <img class="card-img-top"

From 2209ff2b5ab0764e8f77a212320541240c3ca146 Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 16:48:55 +0300
Subject: [PATCH 02/10] simple  classes  for registration list

---
 .../templates/parking/registration_list.html  | 45 +++++++++----------
 1 file changed, 22 insertions(+), 23 deletions(-)

diff --git a/FRONTEND/fastparking/parking/templates/parking/registration_list.html b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
index 4c3faddf..5ce04128 100644
--- a/FRONTEND/fastparking/parking/templates/parking/registration_list.html
+++ b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
@@ -101,12 +101,10 @@ <h2 xmlns="http://www.w3.org/1999/html">Registration List{% if filter_params.day
     </span>
   </div>
 
-<form id="form_filter" method="GET" action="">
- <div class="container">
-    <div class="row">
-      <div class="col">
+<form class="row gx-1 gy-2 align-items-baseline" id="form_filter" method="GET" action="">
+      <div class="col-2">
         <input type="hidden" name="page" value="{{ request.GET.page }}" />
-        <div class="input-group mb-2" title="Show only last days">
+        <div class="input-group" title="Show only last days">
           <label class="input-group-text" for="days" title="Days" aria-label="Days">
             <i class="bi bi-calendar"></i>&nbsp;<span class="btn_text_short">Days</span>:</label>
           <input
@@ -118,41 +116,42 @@ <h2 xmlns="http://www.w3.org/1999/html">Registration List{% if filter_params.day
           />
         </div>
       </div>
-      <div class="col-md-3">
-        <div class="input-group mb-2" title="Present on parking">
+      <div class="col-auto">
+        <div class="input-group" title="Present on parking">
           <label class="input-group-text" for="present"><i class="bi bi-flag"></i>
             <span class="btn_text_short">&nbsp;Present:</span></label>
-          <select class="form-select" name="present">
+          <select class="form-select" id="present" name="present">
             <option value="" {% if request.GET.present == "" %}selected{% endif %}>Any</option>
             <option value="True" {% if request.GET.present == "True" %}selected{% endif %}>Yes</option>
             <option value="False" {% if request.GET.present == "False" %}selected{% endif %}>No</option>
           </select>
         </div>
       </div>
-      <div class="col">
-        <div class="input-group mb-2" title="Filter by car number">
-          <label class="input-group-text" for="car_number"><i class="bi bi-car-front"></i>
+      <div class="col-2">
+        <div class="input-group" title="Filter by car number">
+          <label class="input-group-text" for="car_no"><i class="bi bi-car-front"></i>
             <span class="btn_text_short">&nbsp;IN:</span></label>
-          <input type="text" class="form-control" name="car_no" value="{{ filter_params.car_no }}" />
+          <input type="text" class="form-control" id="car_no" name="car_no" placeholder="Car NO IN" aria-label="Car NO" value="{{ filter_params.car_no }}" />
         </div>
       </div>
-       <div class="col">
-        <div class="input-group mb-2" title="Filter by parking space">
-          <label class="input-group-text" for="p_space"><i class="bi bi-p-square"></i>
-            <span class="btn_text_short">&nbsp;Space:</span></label>
-          <input type="text" class="form-control" name="p_space" value="{{ filter_params.p_space }}"/>
+       <div class="col-2">
+        <div class="input-group" title="Filter by parking space">
+          <label class="input-group-text" for="p_space"><i class="bi bi-p-square"></i></label>
+          <input type="text" class="form-control" list="datalistOptions" id="p_space" name="p_space" placeholder="P.Space" aria-label="P.Space" value="{{ filter_params.p_space }}"/>
+          <datalist id="datalistOptions">
+            <option value="P-00">
+            <option value="P-0">
+            <option value="P-">
+          </datalist>
         </div>
       </div>
-      <div class="col-md">
+      <div class="col">
         <button type="button" onclick="clear_form()" title="Clear text fields"
-              class="btn btn-sm"><i class="fas fa-times"></i></button>
-
-        <button type="submit" class="btn btn-primary text-nowrap" title="Filter" aria-label="Filter">
+              class="btn btn-sm "><i class="fas fa-times"></i></button>
+        <button type="submit" class="btn btn-sm btn-primary text-nowrap" title="Filter" aria-label="Filter">
           <i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span>
         </button>
       </div>
-    </div>
-  </div>
 </form>
 
  <div class="container mt-3">

From 6caaa282e28f983fa3d534b2b5c080c0bc355b15 Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 16:54:51 +0300
Subject: [PATCH 03/10] removed commented unused block

---
 .../templates/parking/registration_list.html  | 33 -------------------
 1 file changed, 33 deletions(-)

diff --git a/FRONTEND/fastparking/parking/templates/parking/registration_list.html b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
index 5ce04128..5ec6b611 100644
--- a/FRONTEND/fastparking/parking/templates/parking/registration_list.html
+++ b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
@@ -163,39 +163,6 @@ <h2 xmlns="http://www.w3.org/1999/html">Registration List{% if filter_params.day
       <span class="btn_text_short"> Back</span></a>
     </div>
 </div>
-
-<!--<div class="container-flex">-->
-<!--  <ul class="list-group list-group-flush  list-group-horizontal">-->
-<!--    <li class="list-group-item text-nowrap">-->
-<!--      <a class="btn btn-primary" target="" href="{% url 'parking:download_csv' %}" title="Export to CSV"><span class="btn_text_short">Save </span><i class="bi bi-filetype-csv"></i></a>-->
-<!--    </li>-->
-<!--    <li class="list-group-item text-nowrap">-->
-<!--      <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i><span class="btn_text_short"> Back</span></a>-->
-<!--    </li>-->
-<!--    <li class="list-group-item w-100">-->
-<!--      <form method="GET" action="">-->
-<!--        <input type="hidden" name="page" value="{{ request.GET.page }}" />-->
-<!--        <div class="input-group mb-2">-->
-<!--          <label class="input-group-text" for="days" title="Days" aria-label="Days"><i class="bi bi-calendar"></i>&nbsp;<span class="btn_text_short">Days</span>:</label>-->
-<!--          <div class="">-->
-<!--            &lt;!&ndash; Apply col-2 class here &ndash;&gt;-->
-<!--            <input-->
-<!--              type="number"-->
-<!--              class="form-control h-100"-->
-<!--              style="max-width: 65px;"-->
-<!--              name="days"-->
-<!--              id="days"-->
-<!--              value="{% if filter_params.days %}{{ filter_params.days }}{% endif %}"-->
-<!--            />-->
-<!--          </div>-->
-<!--          <div class="text-nowrap">-->
-<!--            <button type="submit" class="btn btn-primary" title="Filter" aria-label="Filter"><i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span></button>-->
-<!--          </div>-->
-<!--        </div>-->
-<!--      </form>-->
-<!--    </li>-->
-<!--  </ul>-->
-<!--</div>-->
 </nav>
 <script>
   function clear_form(){

From 2ce0832b6acd3a3ef1311fe62319ce0819c16c00 Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 17:00:46 +0300
Subject: [PATCH 04/10] payments list one style of buttons

---
 .../finance/templates/finance/payments_list.html | 16 ++++++++++------
 1 file changed, 10 insertions(+), 6 deletions(-)

diff --git a/FRONTEND/fastparking/finance/templates/finance/payments_list.html b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
index d42286e8..b5cd7038 100644
--- a/FRONTEND/fastparking/finance/templates/finance/payments_list.html
+++ b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
@@ -60,16 +60,18 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
 <div class="container">
   <ul class="list-group list-group-horizontal">
     <li class="list-group-item">
-      <a class="btn btn-primary" target="_blank" href="{% url 'finance:download_csv' %}">Export to CSV</a>
-    </li>
+      <a class="btn btn-primary" target="" href="{% url 'parking:download_csv' %}" title="Export to CSV">
+        <span class="btn_text_short"></span><i class="bi bi-filetype-csv"></i> Save</a>    </li>
     <li class="list-group-item">
-      <a class="btn btn-primary" href="{% url 'finance:main' %}">Back</a>
-    </li>
+    <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i>
+      <span class="btn_text_short"> Back</span></a>    </li>
     <li class="list-group-item">
       <form method="GET" action="">
         <input type="hidden" name="page" value="{{ request.GET.page }}" />
         <div class="input-group mb-2">
-          <label class="input-group-text" for="days">Days:</label>
+          <label class="input-group-text" for="days" title="Days" aria-label="Days">
+            <i class="bi bi-calendar"></i>&nbsp;<span class="btn_text_short">Days</span>:
+          </label>
           <div class="col-3"> <!-- Apply col-2 class here -->
             <input
               type="number"
@@ -80,7 +82,9 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
             />
           </div>
           <div class="col"> <!-- Adjust the width of the button -->
-            <button type="submit" class="btn btn-primary">Filter</button>
+            <button type="submit" class="btn  btn-primary text-nowrap" title="Filter" aria-label="Filter">
+             <i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span>
+           </button>
           </div>
         </div>
       </form>

From 826d52ce520db76c7be4c91b375be510fc5e321d Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 17:08:53 +0300
Subject: [PATCH 05/10] payments list column icons

---
 .../finance/templates/finance/payments_list.html  | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/FRONTEND/fastparking/finance/templates/finance/payments_list.html b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
index b5cd7038..f371a48d 100644
--- a/FRONTEND/fastparking/finance/templates/finance/payments_list.html
+++ b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
@@ -6,12 +6,12 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
       <thead class="">
         <tr>
           <th scope="col">ID</th>
-          <th scope="col">Registration</th>
-          <th scope="col">Datetime</th>
-          <th scope="col">Car number in</th>
-          <th scope="col">Amount</th>
-          <th scope="col" title="Dynamic calculation for a car that hasn't left yet">Invoice*</th>
-          <th scope="col" title="Moved out">Left</th>
+          <th scope="col"><i class="bi bi-receipt"></i> Registration</th>
+          <th scope="col"><i class="bi bi-calendar"></i>&nbsp;Datetime</th>
+          <th scope="col" class="" title="Car Number In"><i class="bi bi-car-front"></i> IN</th>
+          <th scope="col"><i class="bi bi-cart-check"></i> Amount</th>
+          <th scope="col" title="Dynamic calculation for a car that hasn't left yet"><i class="bi bi-basket"></i> Inv.</th>
+          <th scope="col" title="Moved out"><i class="bi bi-arrow-right-square"></i></th>
         </tr>
       </thead>
       <tbody>
@@ -61,7 +61,8 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
   <ul class="list-group list-group-horizontal">
     <li class="list-group-item">
       <a class="btn btn-primary" target="" href="{% url 'parking:download_csv' %}" title="Export to CSV">
-        <span class="btn_text_short"></span><i class="bi bi-filetype-csv"></i> Save</a>    </li>
+        <i class="bi bi-filetype-csv"></i><span class="btn_text_short"> Save</span></a>
+    </li>
     <li class="list-group-item">
     <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i>
       <span class="btn_text_short"> Back</span></a>    </li>

From c18e4c9e180012d76379bee735d96c284828ccfe Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 17:17:12 +0300
Subject: [PATCH 06/10] car list save button icon

---
 FRONTEND/fastparking/cars/templates/cars/car_list.html | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/templates/cars/car_list.html b/FRONTEND/fastparking/cars/templates/cars/car_list.html
index d719e8f9..7ca464cf 100644
--- a/FRONTEND/fastparking/cars/templates/cars/car_list.html
+++ b/FRONTEND/fastparking/cars/templates/cars/car_list.html
@@ -115,7 +115,8 @@ <h3 class="mb-3 mt-3">List of Cars</h3>
         </span>
       </div>
     </nav>
-    <button class="btn btn-primary mb-3" type="submit">Save</button>
+    <button class="btn btn-primary mb-3" type="submit"><i class="bi bi-save"></i>
+        Save<span class="btn_text_short"> changes</span></button>
   </form>
 {% else %}
 <li>No cars found.</li>

From 04d085cdb6a36acba0b052d38a218eb4028aed30 Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 19:31:53 +0300
Subject: [PATCH 07/10] car list tune filter form

---
 .../cars/templates/cars/car_list.html         | 91 +++++++++++--------
 FRONTEND/fastparking/cars/views.py            | 69 ++++++++------
 2 files changed, 93 insertions(+), 67 deletions(-)

diff --git a/FRONTEND/fastparking/cars/templates/cars/car_list.html b/FRONTEND/fastparking/cars/templates/cars/car_list.html
index 7ca464cf..f0b019bb 100644
--- a/FRONTEND/fastparking/cars/templates/cars/car_list.html
+++ b/FRONTEND/fastparking/cars/templates/cars/car_list.html
@@ -2,47 +2,45 @@
 {% extends "parking/base.html" %} {% block content %} {% load static %}
 <h3 class="mb-3 mt-3">List of Cars</h3>
 
-<!-- Форма фільтрації -->
-<form method="GET" action="{% url 'cars:car_list' %}">
-  <!-- {% csrf_token %} -->
-  <!-- Додайте поля фільтрації за вашими потребами -->
-  <div class="container">  
-    <div class="row">  
-        <div class="col">  
-          <div class="input-group mb-2">
-            <label class="input-group-text" for="car_number">Car Number:</label>
-            <input type="text" class="form-control" name="car_number" style="width: 300px" />
-          </div>
+<form class="row gx-1 gy-2 align-items-baseline" id="form_filter" method="GET" action="{% url 'cars:car_list' %}">
+      <input type="hidden" name="page" value="{{ filter_params.page }}" />
+      <div class="col-2">
+        <div class="input-group" title="Filter by car number">
+          <label class="input-group-text" for="car_no"><i class="bi bi-car-front"></i>
+            <span class="btn_text_short">&nbsp;NO:</span></label>
+          <input type="text" class="form-control" id="car_no" name="car_no" placeholder="Car NO" aria-label="Car NO" value="{{ filter_params.car_no }}" />
         </div>
-        <div class="col-md-3">
-          <div class="input-group mb-2">
-            <label class="input-group-text" for="blocked">Blocked:</label>
-            <select class="form-select" name="blocked">
-              <option value="" {% if request.GET.blocked == "" %}selected{% endif %}>Any</option>
-              <option value="True" {% if request.GET.blocked == "True" %}selected{% endif %}>Yes</option>
-              <option value="False" {% if request.GET.blocked == "False" %}selected{% endif %}>No</option>
-            </select>
-          </div>
-        </div>
-        <div class="col-md-3">
-          <div class="input-group mb-2">
-            <label class="input-group-text" for="blocked">PayPass:</label>
-            <select class="form-select" name="paypass">
-              <option value="" {% if request.GET.paypass == "" %}selected{% endif %}>Any</option>
-              <option value="True" {% if request.GET.paypass == "True" %}selected{% endif %}>Yes</option>
-              <option value="False" {% if request.GET.paypass == "False" %}selected{% endif %}>No</option>
-            </select>
-          </div>
+      </div>
+      <div class="col-auto">
+        <div class="input-group" title="Blocked">
+          <label class="input-group-text" for="blocked"><span class="btn_text_short">&nbsp;Blocked:</span></label>
+          <select class="form-select" id="blocked" name="blocked">
+            <option value="" {% if filter_params.blocked == "" %}selected{% endif %}>Any</option>
+            <option value="True" {% if filter_params.blocked == True %}selected{% endif %}>Yes</option>
+            <option value="False" {% if filter_params.blocked == False %}selected{% endif %}>No</option>
+          </select>
         </div>
-        <div class="col-md-1">  
-          <button class="btn btn-primary mb-3" type="submit" style="width: 100%">Filter</button>
+      </div>
+       <div class="col-auto">
+        <div class="input-group" title="PayPass">
+          <label class="input-group-text" for="paypass">PayPass:</label>
+          <select class="form-select" id="paypass" name="paypass">
+            <option value="" {% if filter_params.paypass == "" %}selected{% endif %}>Any</option>
+            <option value="True" {% if filter_params.paypass == True %}selected{% endif %}>Yes</option>
+            <option value="False" {% if filter_params.paypass == False %}selected{% endif %}>No</option>
+          </select>
         </div>
-    </div>
-  </div>
-
-
+      </div>
+      <div class="col">
+        <button type="button" onclick="clear_form()" title="Clear text fields"
+              class="btn btn-sm "><i class="fas fa-times"></i></button>
+        <button type="submit" class="btn btn-sm btn-primary text-nowrap" title="Filter" aria-label="Filter">
+          <i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span>
+        </button>
+      </div>
 </form>
 
+
 {% if cars %}
 <div class="bd-example">
   <form method="post" action="{% url 'cars:car_list' %}">
@@ -97,20 +95,20 @@ <h3 class="mb-3 mt-3">List of Cars</h3>
       <div class="d-flex justify-content-center">
         <span class="text-center" style="width: 80px">
           {% if page_obj.has_previous %}
-          <a href="?page={{ page_obj.previous_page_number }}&blocked={{request.GET.blocked}}&paypass={{request.GET.paypass}}" class="btn btn-sm btn-outline-primary" role="button">Prev</a>
+          <a href="?page={{ page_obj.previous_page_number }}&blocked={{filter_params.blocked}}&paypass={{filter_params.paypass}}&car_no={{filter_params.car_no }}" class="btn btn-sm btn-outline-primary" role="button">Prev</a>
           {% endif %}
         </span>
     
         <ul class="pagination pagination-sm">
           {% for p in paginator.page_range %}
           <li class="page-item{% if p == page_obj.number %} active{% endif %}">
-            <a href="?page={{ p }}&blocked={{request.GET.blocked}}&paypass={{request.GET.paypass}}" class="page-link">{{ p }}</a>
+            <a href="?page={{ p }}&blocked={{filter_params.blocked}}&paypass={{filter_params.paypass}}&car_no={{filter_params.car_no }}" class="page-link">{{ p }}</a>
           </li>
           {% endfor %}
         </ul>
         <span class="text-center" style="width: 80px">
           {% if page_obj.has_next %}
-          <a href="?page={{ page_obj.next_page_number }}&blocked={{request.GET.blocked}}&paypass={{request.GET.paypass}}" class="btn btn-sm btn-outline-primary" role="button">Next</a>
+          <a href="?page={{ page_obj.next_page_number }}&blocked={{ filter_params.blocked }}&paypass={{ filter_params.paypass }}&car_no={{ filter_params.car_no }}" class="btn btn-sm btn-outline-primary" role="button">Next</a>
           {% endif %}
         </span>
       </div>
@@ -122,5 +120,18 @@ <h3 class="mb-3 mt-3">List of Cars</h3>
 <li>No cars found.</li>
 {% endif %}
 <br />
-
+<script>
+  function clear_form(){
+    let form=document.getElementById('form_filter');
+    if (form) {
+      let inputs = form.getElementsByTagName('input');
+      let fieldsToClear = ['car_no'];
+      for (let i = 0; i < inputs.length; i++) {
+        if (fieldsToClear.includes(inputs[i].name)) {
+          inputs[i].value = '';
+        }
+      }
+     }
+  }
+</script>
 {% endblock content %}
diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index 43e32b0a..116d4dcb 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -31,43 +31,56 @@ def validate_int(self, value: str | int | None) -> int | None:
                 value = 1
         return value
 
+    def get_filter_params(self) -> dict:
+        page_number = self.validate_int(self.request.GET.get("page"))
+        car_no = self.request.GET.get("car_no", "")
+        blocked = self.request.GET.get("blocked")
+        paypass = self.request.GET.get("paypass")
+        if blocked:  # Handle potential absence of 'blocked' parameter
+            blocked = blocked.strip().lower() == "true"
+        if paypass:  # Handle potential absence of 'blocked' parameter
+            paypass = paypass.strip().lower() == "true"
+        if car_no:
+            car_no = car_no.strip().upper()
+            car_no = "".join(char for char in car_no if char.isalnum())
+        filter_params = {
+            "car_no": car_no,
+            "blocked": blocked,
+            "paypass": paypass,
+            "page": page_number,
+        }
+        return filter_params
+
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        page_number = self.validate_int(self.request.GET.get("page"))
+        filter_params = self.get_filter_params()
         queryset = context["object_list"]
         paginator = Paginator(queryset, self.page_items)
-        if page_number:
-            page_obj = paginator.get_page(page_number)
+        if filter_params.get("page"):
+            page_obj = paginator.get_page(filter_params["page"])
         else:
             page_obj = paginator.page(1)  # Get the first page by default
 
-        # Call the base implementation first to get the original context
-
         # Add additional context data
         context["title"] = "Cars"
         context["active_menu"] = "cars"
         context["paginator"] = paginator
         context["page_obj"] = page_obj
+        context["filter_params"] = filter_params
 
         return context
 
     def get_queryset(self):
         queryset = Car.objects.all().order_by("car_number")
-        car_number = self.request.GET.get("car_number")
-        blocked = self.request.GET.get("blocked")
-        paypass = self.request.GET.get("paypass")
-
-        if car_number:
-            car_number = car_number.strip().upper()
-            car_number = "".join(char for char in car_number if char.isalnum())
-            queryset = queryset.filter(car_number__icontains=car_number)
-        if blocked:  # Handle potential absence of 'blocked' parameter
-            blocked = blocked.strip().lower() == "true"
-            queryset = queryset.filter(blocked=blocked)
-        if paypass:  # Handle potential absence of 'blocked' parameter
-            paypass = paypass.strip().lower() == "true"
-            queryset = queryset.filter(PayPass=paypass)
-
+        filter_params = self.get_filter_params()
+        if filter_params.get("car_no"):
+            queryset = queryset.filter(car_number__icontains=filter_params["car_no"])
+        if filter_params.get(
+            "blocked"
+        ):  # Handle potential absence of 'blocked' parameter
+            queryset = queryset.filter(blocked=filter_params["blocked"])
+        if filter_params.get("paypass"):
+            queryset = queryset.filter(PayPass=filter_params["paypass"])
         return queryset
 
     def post(self, request, *args, **kwargs):
@@ -75,12 +88,14 @@ def post(self, request, *args, **kwargs):
         blocked_id = request.POST.getlist("blocked")
         pay_pass_id = request.POST.getlist("pay_pass")
         for id in cars_id:
-            blocked = id in blocked_id
-            pay_pass = id in pay_pass_id
-            # print(id, blocked, pay_pass)
-            try:
-                Car.objects.filter(pk=id).update(blocked=blocked, PayPass=pay_pass)
-            except Car.DoesNotExist:
-                ...
+            id = self.validate_int(id)
+            if id:
+                blocked = id in blocked_id
+                pay_pass = id in pay_pass_id
+                # print(id, blocked, pay_pass)
+                try:
+                    Car.objects.filter(pk=id).update(blocked=blocked, PayPass=pay_pass)
+                except Car.DoesNotExist:
+                    ...
 
         return redirect(reverse("cars:car_list"))

From 9e0a01b4901db70cba85dc237bdbd01109cbb2cf Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 19:32:50 +0300
Subject: [PATCH 08/10] version 0.5.4

---
 FRONTEND/pyproject.toml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FRONTEND/pyproject.toml b/FRONTEND/pyproject.toml
index 7b39c0bf..a76d9b64 100644
--- a/FRONTEND/pyproject.toml
+++ b/FRONTEND/pyproject.toml
@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "fastparking"
-version = "0.4.27"
+version = "0.5.4"
 description = "GoIT DataScience Team Project - Fast Parking"
 authors = ["neuron_curva_bobr <info@neuron.curva.bobr.app>"]
 license = "MIT"

From 49adc384a8e6f48f7b5119edbc0a10b05935e3df Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 19:51:37 +0300
Subject: [PATCH 09/10] payments list buttons

---
 .../templates/finance/payments_list.html      | 90 ++++++++++++-------
 1 file changed, 57 insertions(+), 33 deletions(-)

diff --git a/FRONTEND/fastparking/finance/templates/finance/payments_list.html b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
index f371a48d..04056e3d 100644
--- a/FRONTEND/fastparking/finance/templates/finance/payments_list.html
+++ b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
@@ -57,41 +57,65 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
     </span>
   </div>
 </nav>
-<div class="container">
-  <ul class="list-group list-group-horizontal">
-    <li class="list-group-item">
-      <a class="btn btn-primary" target="" href="{% url 'parking:download_csv' %}" title="Export to CSV">
-        <i class="bi bi-filetype-csv"></i><span class="btn_text_short"> Save</span></a>
-    </li>
-    <li class="list-group-item">
-    <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i>
-      <span class="btn_text_short"> Back</span></a>    </li>
-    <li class="list-group-item">
-      <form method="GET" action="">
+
+<form class="row gx-1 gy-2 align-items-baseline" id="form_filter" method="GET" action="">
+      <div class="col-2">
         <input type="hidden" name="page" value="{{ request.GET.page }}" />
-        <div class="input-group mb-2">
+        <div class="input-group" title="Show only last days">
           <label class="input-group-text" for="days" title="Days" aria-label="Days">
-            <i class="bi bi-calendar"></i>&nbsp;<span class="btn_text_short">Days</span>:
-          </label>
-          <div class="col-3"> <!-- Apply col-2 class here -->
-            <input
-              type="number"
-              class="form-control"
-              name="days"
-              id="days"
-              value="{% if filter_params.days %}{{ filter_params.days }}{% endif %}"
-            />
-          </div>
-          <div class="col"> <!-- Adjust the width of the button -->
-            <button type="submit" class="btn  btn-primary text-nowrap" title="Filter" aria-label="Filter">
-             <i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span>
-           </button>
-          </div>
+            <i class="bi bi-calendar"></i>&nbsp;<span class="btn_text_short">Days</span>:</label>
+          <input
+            type="number"
+            class="form-control h-100"
+            name="days"
+            id="days"
+            value="{% if filter_params.days %}{{ filter_params.days }}{% endif %}"
+          />
         </div>
-      </form>
-    </li>
-  </ul>
-</div>
-
+      </div>
+      <div class="col-auto">
+        <div class="input-group" title="Filter by Registration ID">
+          <label class="input-group-text" for="r_id"><i class="bi bi-receipt"></i><span class="btn_text_short">&nbsp;Registration</span></label>
+          <input type="text" class="form-control" id="r_id" name="r_id" placeholder="Reg ID" aria-label="Reg ID" value="{{ filter_params.r_id }}"/>
+        </div>
+      </div>
+      <div class="col-auto">
+        <div class="input-group" title="Filter by car number">
+          <label class="input-group-text" for="car_no"><i class="bi bi-car-front"></i>
+            <span class="btn_text_short">&nbsp;IN:</span></label>
+          <input type="text" class="form-control" id="car_no" name="car_no" placeholder="Car NO IN" aria-label="Car NO" value="{{ filter_params.car_no }}" />
+        </div>
+      </div>
+      <div class="col">
+        <button type="button" onclick="clear_form()" title="Clear text fields"
+              class="btn btn-sm "><i class="fas fa-times"></i></button>
+        <button type="submit" class="btn btn-sm btn-primary text-nowrap" title="Filter" aria-label="Filter">
+          <i class="bi bi-filter-square"></i><span class="btn_text_short"> Filter</span>
+        </button>
+      </div>
+</form>
+ <input type="hidden" name="page" value="{{ request.GET.page }}" />
+ <div class="container mt-3">
+    <div class="col">
+      <a class="btn btn-primary" target="" href="{% url 'finance:download_csv' %}" title="Export to CSV">
+        <span class="btn_text_short"></span><i class="bi bi-filetype-csv"></i> Save</a>
 
+    <a class="btn btn-primary" href="{% url 'finance:main' %}"><i class="bi bi-arrow-left-circle"></i>
+      <span class="btn_text_short"> Back</span></a>
+    </div>
+</div>
+<script>
+  function clear_form(){
+    let form=document.getElementById('form_filter');
+    if (form) {
+      let inputs = form.getElementsByTagName('input');
+      let fieldsToClear = ['car_no', 'r_id'];
+      for (let i = 0; i < inputs.length; i++) {
+        if (fieldsToClear.includes(inputs[i].name)) {
+          inputs[i].value = '';
+        }
+      }
+     }
+  }
+</script>
 {% endblock %}

From 155aed07b17c654a13f2dec40251fe65bcd1ec3e Mon Sep 17 00:00:00 2001
From: lexxai <lexxai@gmail.com>
Date: Sat, 4 May 2024 19:59:22 +0300
Subject: [PATCH 10/10] payments list buttons

---
 FRONTEND/fastparking/cars/templates/cars/car_list.html       | 2 +-
 .../fastparking/finance/templates/finance/payments_list.html | 5 ++---
 .../parking/templates/parking/registration_list.html         | 5 ++---
 3 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/FRONTEND/fastparking/cars/templates/cars/car_list.html b/FRONTEND/fastparking/cars/templates/cars/car_list.html
index f0b019bb..0fc6be3f 100644
--- a/FRONTEND/fastparking/cars/templates/cars/car_list.html
+++ b/FRONTEND/fastparking/cars/templates/cars/car_list.html
@@ -48,7 +48,7 @@ <h3 class="mb-3 mt-3">List of Cars</h3>
     <table class="table table-striped table-hover">
       <thead>
         <tr>
-          <th scope="col">Number</th>
+          <th scope="col"><i class="bi bi-car-front"></i> Number</th>
           <!-- <th scope="col">Photo</th>
         <th scope="col">Predict</th> -->
           <th scope="col" class="text-center">Blocked</th>
diff --git a/FRONTEND/fastparking/finance/templates/finance/payments_list.html b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
index 04056e3d..23f0c032 100644
--- a/FRONTEND/fastparking/finance/templates/finance/payments_list.html
+++ b/FRONTEND/fastparking/finance/templates/finance/payments_list.html
@@ -97,11 +97,10 @@ <h2>Payments List{% if filter_params.days %} for last {{ filter_params.days}} da
  <input type="hidden" name="page" value="{{ request.GET.page }}" />
  <div class="container mt-3">
     <div class="col">
+      <a class="btn btn-primary" href="{% url 'finance:main' %}"><i class="bi bi-arrow-left-circle"></i>
+         <span class="btn_text_short"> Back</span></a>
       <a class="btn btn-primary" target="" href="{% url 'finance:download_csv' %}" title="Export to CSV">
         <span class="btn_text_short"></span><i class="bi bi-filetype-csv"></i> Save</a>
-
-    <a class="btn btn-primary" href="{% url 'finance:main' %}"><i class="bi bi-arrow-left-circle"></i>
-      <span class="btn_text_short"> Back</span></a>
     </div>
 </div>
 <script>
diff --git a/FRONTEND/fastparking/parking/templates/parking/registration_list.html b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
index 5ec6b611..72f0d690 100644
--- a/FRONTEND/fastparking/parking/templates/parking/registration_list.html
+++ b/FRONTEND/fastparking/parking/templates/parking/registration_list.html
@@ -156,11 +156,10 @@ <h2 xmlns="http://www.w3.org/1999/html">Registration List{% if filter_params.day
 
  <div class="container mt-3">
     <div class="col">
+      <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i>
+        <span class="btn_text_short"> Back</span></a>
       <a class="btn btn-primary" target="" href="{% url 'parking:download_csv' %}" title="Export to CSV">
         <span class="btn_text_short"></span><i class="bi bi-filetype-csv"></i> Save</a>
-
-    <a class="btn btn-primary" href="{% url 'parking:main' %}"><i class="bi bi-arrow-left-circle"></i>
-      <span class="btn_text_short"> Back</span></a>
     </div>
 </div>
 </nav>