Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Lexxai user registrations list #162

Merged
merged 10 commits into from
May 4, 2024
Merged

Lexxai user registrations list #162

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
7cf773c
tune parking icon fills
lexxai May 4, 2024
2209ff2
simple classes for registration list
lexxai May 4, 2024
6caaa28
removed commented unused block
lexxai May 4, 2024
2ce0832
payments list one style of buttons
lexxai May 4, 2024
826d52c
payments list column icons
lexxai May 4, 2024
c18e4c9
car list save button icon
lexxai May 4, 2024
04d085c
car list tune filter form
lexxai May 4, 2024
9e0a01b
version 0.5.4
lexxai May 4, 2024
49adc38
payments list buttons
lexxai May 4, 2024
155aed0
payments list buttons
lexxai May 4, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
96 changes: 54 additions & 42 deletions FRONTEND/fastparking/cars/templates/cars/car_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,55 +2,53 @@
{% 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' %}">
{% csrf_token %}
<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>
Expand Down Expand Up @@ -97,29 +95,43 @@ <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>
</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>
{% 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 %}
69 changes: 42 additions & 27 deletions FRONTEND/fastparking/cars/views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,56 +31,71 @@ 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):
cars_id = request.POST.getlist("cars")
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"))
98 changes: 63 additions & 35 deletions FRONTEND/fastparking/finance/templates/finance/payments_list.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down Expand Up @@ -57,36 +57,64 @@ <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="_blank" href="{% url 'finance:download_csv' %}">Export to CSV</a>
</li>
<li class="list-group-item">
<a class="btn btn-primary" href="{% url 'finance:main' %}">Back</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">
<label class="input-group-text" for="days">Days:</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">Filter</button>
</div>
<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
type="number"
class="form-control h-100"
name="days"
id="days"
value="{% if filter_params.days %}{{ filter_params.days }}{% endif %}"
/>
</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>
</form>
</li>
</ul>
</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" 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>
</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 %}
4 changes: 2 additions & 2 deletions FRONTEND/fastparking/parking/templates/parking/parking_plan.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down
Loading
Loading