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.

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

Solution #880

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
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
Binary file added db.sqlite3
Binary file not shown.
16 changes: 11 additions & 5 deletions taxi/views.py
Original file line number Diff line number Diff line change
@@ -1,47 +1,53 @@
from django.contrib.auth.decorators import login_required
from django.contrib.auth.mixins import LoginRequiredMixin
from django.shortcuts import render
from django.views import generic

from .models import Driver, Car, Manufacturer


@login_required
def index(request):
"""View function for the home page of the site."""

num_drivers = Driver.objects.count()
num_cars = Car.objects.count()
num_manufacturers = Manufacturer.objects.count()
num_visits = request.session.get("num_visits", 0)
request.session["num_visits"] = num_visits + 1
Comment on lines +16 to +17

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The num_visits variable is incremented twice: once when retrieving it from the session and again when updating the session. This results in an off-by-one error in the context dictionary. Consider incrementing num_visits only once and using the updated value both for setting the session and in the context.


context = {
"num_drivers": num_drivers,
"num_cars": num_cars,
"num_manufacturers": num_manufacturers,
"num_visits": num_visits + 1,

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The num_visits value in the context dictionary is incremented again, which is unnecessary since it was already incremented when updating the session. Use the num_visits variable directly without adding 1 again.

}

return render(request, "taxi/index.html", context=context)


class ManufacturerListView(generic.ListView):
class ManufacturerListView(LoginRequiredMixin, generic.ListView):
model = Manufacturer
context_object_name = "manufacturer_list"
template_name = "taxi/manufacturer_list.html"
paginate_by = 5


class CarListView(generic.ListView):
class CarListView(LoginRequiredMixin, generic.ListView):
model = Car
paginate_by = 5
queryset = Car.objects.select_related("manufacturer")


class CarDetailView(generic.DetailView):
class CarDetailView(LoginRequiredMixin, generic.DetailView):
model = Car


class DriverListView(generic.ListView):
class DriverListView(LoginRequiredMixin, generic.ListView):
model = Driver
paginate_by = 5


class DriverDetailView(generic.DetailView):
class DriverDetailView(LoginRequiredMixin, generic.DetailView):
model = Driver
queryset = Driver.objects.prefetch_related("cars__manufacturer")
3 changes: 3 additions & 0 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -133,3 +133,6 @@
# https://docs.djangoproject.com/en/4.0/ref/settings/#default-auto-field

DEFAULT_AUTO_FIELD = "django.db.models.BigAutoField"

LOGIN_REDIRECT_URL = "/"
LOGOUT_REDIRECT_URL = "/"
1 change: 1 addition & 0 deletions taxi_service/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -22,4 +22,5 @@
urlpatterns = [
path("admin/", admin.site.urls),
path("", include("taxi.urls", namespace="taxi")),
path("accounts/", include("django.contrib.auth.urls")),
] + static(settings.STATIC_URL, document_root=settings.STATIC_ROOT)
34 changes: 30 additions & 4 deletions templates/includes/sidebar.html
Original file line number Diff line number Diff line change
@@ -1,6 +1,32 @@
<ul class="sidebar-nav">
<li><a href="{% url "taxi:index" %}">Home page</a></li>
<li><a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a></li>
<li><a href="{% url "taxi:car-list" %}">Cars</a></li>
<li><a href="{% url "taxi:driver-list" %}">Drivers</a></li>
{% if user.is_authenticate %}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

There is a typo in the template tag. It should be {% if user.is_authenticated %} instead of {% if user.is_authenticate %}. This will correctly check if the user is authenticated.

<li>
<a href="{% url 'taxi:driver-detail' user.pk %}">
User: {{ user.username }}
</a>
</li>
<li>
<form action="{% url 'logout' %}" method="post">
{% csrf_token %}
<button type="submit">Logout</button>
</form>
</li>
{% else %}
<li>
<a href="{% url 'login' %}">Login</a>
</li>
{% endif %}
<br>
<li>
<a href="{% url "taxi:index" %}">Home page</a>
</li>
<li>
<a href="{% url "taxi:manufacturer-list" %}">Manufacturers</a>
</li>
<li>
<a href="{% url "taxi:car-list" %}">Cars</a>
</li>
<li>
<a href="{% url "taxi:driver-list" %}">Drivers</a>
</li>
</ul>
6 changes: 6 additions & 0 deletions templates/registration/logged_out.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
{% extends "base.html" %}

{% block content %}
<p>Logged Out</p>
<a href="{% url 'login' %}">Click here to log in again.</a>
{% endblock %}
14 changes: 14 additions & 0 deletions templates/registration/login.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
{% extends "base.html" %}

{% block content %}
<h1>Login</h1>
{% if form.errors %}
<p style="color: red">Invalid credentials</p>
{% endif %}
<form action="{% url 'login' %}" method="post">
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Submit">
<input type="hidden" name="next" value="{{ next }}">
</form>
{% endblock %}
6 changes: 3 additions & 3 deletions templates/taxi/car_detail.html
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
<h1>Drivers</h1>
<hr>
<ul>
{% for driver in car.drivers.all %}
<li>{{ driver.first_name }} {{ driver.last_name }}</li>
{% endfor %}
{% for driver in car.drivers.all %}

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The iteration over car.drivers.all should use parentheses: car.drivers.all(). This is necessary to call the method and retrieve the list of drivers.

<li>{{ driver.first_name }} {{ driver.last_name }}</li>
{% endfor %}
</ul>
{% endblock %}
6 changes: 4 additions & 2 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,11 @@
<h1>Driver list</h1>
{% if driver_list %}
<ul>
{% for driver in driver_list%}
{% for driver in driver_list %}
<li>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}</a>
<a href="{% url "taxi:driver-detail" pk=driver.id %}">{{ driver.username }}
{% if user == driver %} (Me) {% endif %}
</a>
({{ driver.first_name }} {{ driver.last_name }})
</li>
{% endfor %}
Expand Down
1 change: 1 addition & 0 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -10,4 +10,5 @@ <h2>Dynamic content</h2>
<li><strong>Drivers:</strong> {{ num_drivers }}</li>
<li><strong>Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>
<p>You have visited this page {{ num_visits }} time {{ num_visits|pluralize }}.</p>
{% endblock %}
Loading