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 #437

Open
wants to merge 19 commits 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
28 changes: 27 additions & 1 deletion taxi/urls.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,13 @@
DriverListView,
DriverDetailView,
ManufacturerListView,
CarCreateView,
DriverCreateView,
ManufacturerCreateView,
CarUpdateView,
CarDeleteView,
ManufacturerUpdateView,
ManufacturerDeleteView,
)

urlpatterns = [
Expand All @@ -19,8 +26,27 @@
path("cars/", CarListView.as_view(), name="car-list"),
path("cars/<int:pk>/", CarDetailView.as_view(), name="car-detail"),
path("drivers/", DriverListView.as_view(), name="driver-list"),
path("drivers/<int:pk>/",
DriverDetailView.as_view(),
name="driver-detail"),
path("car/create/", CarCreateView.as_view(), name="car-create"),
path("car/update/<int:pk>", CarUpdateView.as_view(), name="car-update"),
path("car/delete/<int:pk>", CarDeleteView.as_view(), name="car-delete"),
path("driver/create/", DriverCreateView.as_view(), name="driver-create"),
path(
"drivers/<int:pk>/", DriverDetailView.as_view(), name="driver-detail"
"manufacturer/create",
ManufacturerCreateView.as_view(),
name="manufacturer-create",
),
path(
"manufacturer/update/<int:pk>",
ManufacturerUpdateView.as_view(),
name="manufacturer-update",
),
path(
"manufacturer/delete/<int:pk>",
ManufacturerDeleteView.as_view(),
name="manufacturer-delete",
),
]

Expand Down
49 changes: 48 additions & 1 deletion taxi/views.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
from django.shortcuts import render
from django.views import generic
from django.contrib.auth.mixins import LoginRequiredMixin

from django.urls import reverse_lazy
from .models import Driver, Car, Manufacturer


Expand Down Expand Up @@ -40,10 +40,30 @@ class CarListView(LoginRequiredMixin, generic.ListView):
queryset = Car.objects.all().select_related("manufacturer")


class CarCreateView(generic.CreateView):
model = Car
fields = "__all__"
success_url = reverse_lazy("taxi:car-list")
template_name = "taxi/car_form.html"


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


class CarUpdateView(generic.UpdateView):
model = Car
fields = "__all__"
success_url = reverse_lazy("taxi:car-list")
template_name = "taxi/car_form.html"


class CarDeleteView(generic.DeleteView):
model = Car
success_url = reverse_lazy("taxi:car-list")
template_name = "taxi/car_confirm_delete.html"


class DriverListView(LoginRequiredMixin, generic.ListView):
model = Driver
paginate_by = 5
Expand All @@ -52,3 +72,30 @@ class DriverListView(LoginRequiredMixin, generic.ListView):
class DriverDetailView(LoginRequiredMixin, generic.DetailView):
model = Driver
queryset = Driver.objects.all().prefetch_related("cars__manufacturer")


class DriverCreateView(generic.CreateView):
model = Driver
fields = "__all__"
success_url = reverse_lazy("taxi:driver-list")
template_name = "taxi/driver_form.html"


class ManufacturerCreateView(generic.CreateView):
model = Manufacturer
fields = "__all__"
success_url = reverse_lazy("taxi:manufacturer-list")
template_name = "taxi/manufacturer_form.html"


class ManufacturerUpdateView(generic.UpdateView):
model = Manufacturer
fields = "__all__"
success_url = reverse_lazy("taxi:manufacturer-list")
template_name = "taxi/manufacturer_form.html"


class ManufacturerDeleteView(generic.DeleteView):
model = Manufacturer
success_url = reverse_lazy("taxi:manufacturer-list")
template_name = "taxi/manufacturer_confirm_delete.html"
12 changes: 4 additions & 8 deletions taxi_service/settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@
# Build paths inside the project like this: BASE_DIR / "subdir".
BASE_DIR = Path(__file__).resolve().parent.parent


# Quick-start development settings - unsuitable for production
# See https://docs.djangoproject.com/en/4.0/howto/deployment/checklist/

Expand Down Expand Up @@ -77,7 +76,6 @@

WSGI_APPLICATION = "taxi_service.wsgi.application"


# Database
# https://docs.djangoproject.com/en/4.0/ref/settings/#databases

Expand All @@ -88,26 +86,25 @@
}
}


# Password validation
# https://docs.djangoproject.com/en/4.0/ref/settings/#auth-password-validators

AUTH_PASSWORD_VALIDATORS = [
{
"NAME": "django.contrib.auth.password_validation."
"UserAttributeSimilarityValidator",
"UserAttributeSimilarityValidator",
},
{
"NAME": "django.contrib.auth.password_validation."
"MinimumLengthValidator",
"MinimumLengthValidator",
},
{
"NAME": "django.contrib.auth.password_validation."
"CommonPasswordValidator",
"CommonPasswordValidator",
},
{
"NAME": "django.contrib.auth.password_validation."
"NumericPasswordValidator",
"NumericPasswordValidator",
},
]

Expand All @@ -126,7 +123,6 @@

USE_TZ = True


# Static files (CSS, JavaScript, Images)
# https://docs.djangoproject.com/en/4.0/howto/static-files/

Expand Down
16 changes: 16 additions & 0 deletions templates/taxi/car_confirm_delete.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends "base.html" %}

{% block content %}
<div class="container text-center mt-5">
<h1 class="display-4 text-danger">Delete Car</h1>
<p class="mt-4">Are you sure you want to delete the following car?</p>
<div class="alert alert-warning" role="alert">
{{ car }}
</div>
<form action="" method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger btn-lg mt-4">Confirm Delete</button>
</form>
<a href="{% url 'taxi:car-list' %}" class="btn btn-primary btn-lg mt-4">Cancel</a>
</div>
{% endblock %}
31 changes: 31 additions & 0 deletions templates/taxi/car_form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,31 @@
{% extends "base.html" %}

{% block content %}
<div class="container">
<h1 class="text-center mt-4">{{ object|yesno:"Update, Create" }} New Car</h1>
<form action="" method="post" novalidate class="mt-4">
{% csrf_token %}
<div class="form-group">
{{ form.model.label_tag }}
{{ form.model }}
</div>
<div class="form-group">
{{ form.manufacturer.label_tag }}
{{ form.manufacturer }}
</div>
<div class="form-group">
{{ form.year.label_tag }}
{{ form.year }}
</div>
<div class="form-group">
{{ form.color.label_tag }}
{{ form.color }}
</div>
<div class="form-group">
{{ form.license_plate.label_tag }}
{{ form.license_plate }}
</div>
<button type="submit" class="btn btn-primary">Create</button>
</form>
</div>
{% endblock %}
36 changes: 23 additions & 13 deletions templates/taxi/car_list.html
Original file line number Diff line number Diff line change
@@ -1,17 +1,27 @@
{% extends "base.html" %}

{% block content %}
<h1>Car list</h1>
{% if car_list %}
<ul>
{% for car in car_list %}
<li>
<a href="{% url "taxi:car-detail" pk=car.id %} ">{{ car.id }}</a>
{{ car.model }} ({{ car.manufacturer.name }})
</li>
{% endfor %}
</ul>
{% else %}
<p>There are no cars in taxi</p>
{% endif %}
<div class="container">
<h1 class="text-center mt-4">Car List</h1>
<a href="{% url 'taxi:car-create' %}" class="btn btn-primary mb-4">Add New Car</a>

{% if car_list %}
<ul class="list-group">
{% for car in car_list %}
<li class="list-group-item d-flex justify-content-between align-items-center">
<div>
<a href="{% url 'taxi:car-detail' pk=car.id %}">{{ car.model }}</a>
<small class="text-muted">{{ car.manufacturer.name }}</small>
</div>
<div class="btn-group" role="group">
<a href="{% url 'taxi:car-update' pk=car.id %}" class="btn btn-warning btn-sm">Update</a>
<a href="{% url 'taxi:car-delete' pk=car.id %}" class="btn btn-danger btn-sm">Delete</a>
</div>
</li>
{% endfor %}
</ul>
{% else %}
<p class="text-danger mt-4">There are no cars in the taxi service.</p>
{% endif %}
</div>
{% endblock %}
10 changes: 10 additions & 0 deletions templates/taxi/driver_form.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
{% extends "base.html" %}

{% block content %}
<h1>Create New Driver</h1>
<form action="" method="post" novalidate>
{% csrf_token %}
{{ form.as_p }}
<input type="submit" value="Створити">
</form>
{% endblock %}
59 changes: 34 additions & 25 deletions templates/taxi/driver_list.html
Original file line number Diff line number Diff line change
@@ -1,30 +1,39 @@
{% extends "base.html" %}

{% block content %}
<h1>Driver List
</h1>
<div class="container">
<h1 class="text-center mb-4">Driver List</h1>
<a href="{% url 'taxi:driver-create' %}" class="btn btn-success mb-4">Create New Driver</a>

{% if driver_list %}
<table class="table">
<tr>
<th>ID</th>
<th>Username</th>
<th>First name</th>
<th>Last name</th>
<th>License number</th>
</tr>
{% for driver in driver_list %}
<tr>
<td>{{ driver.id }}</td>
<td><a href="{{ driver.get_absolute_url }}">{{ driver.username }} {% if user == driver %} (Me){% endif %}</a></td>
<td>{{ driver.first_name }}</td>
<td>{{ driver.last_name }}</td>
<td>{{ driver.license_number }}</td>
</tr>
{% endfor %}

</table>
{% else %}
<p>There are no drivers in the service.</p>
{% endif %}
{% if driver_list %}
<table class="table table-striped table-bordered">
<thead class="thead-dark">
<tr>
<th>ID</th>
<th>Username</th>
<th>First Name</th>
<th>Last Name</th>
<th>License Number</th>
</tr>
</thead>
<tbody>
{% for driver in driver_list %}
<tr>
<td>{{ driver.id }}</td>
<td>
<a href="{{ driver.get_absolute_url }}">
{{ driver.username }} {% if user == driver %} (Me){% endif %}
</a>
</td>
<td>{{ driver.first_name }}</td>
<td>{{ driver.last_name }}</td>
<td>{{ driver.license_number }}</td>
</tr>
{% endfor %}
</tbody>
</table>
{% else %}
<p class="text-danger">There are no drivers in the service.</p>
{% endif %}
</div>
{% endblock %}
26 changes: 13 additions & 13 deletions templates/taxi/index.html
Original file line number Diff line number Diff line change
@@ -1,18 +1,18 @@
{% extends "base.html" %}

{% block content %}
<h1>Taxi Service Home</h1>
<p>Welcome to Best Taxi Ever!</p>
<h2>Dynamic content</h2>
<p>The Taxi service has the following record counts:</p>
<ul>
<li><strong>Cars:</strong> {{ num_cars }}</li>
<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>
<div class="container text-center">
<h1 class="display-4 mt-4 text-primary">Welcome to Best Taxi Ever!</h1>
<h2 class="mt-4">Dynamic Content</h2>
<p class="text-muted">The Taxi service has the following record counts:</p>
<ul class="list-group">
<li class="list-group-item"><strong class="text-danger">Cars:</strong> {{ num_cars }}</li>
<li class="list-group-item"><strong class="text-success">Drivers:</strong> {{ num_drivers }}</li>
<li class="list-group-item"><strong class="text-info">Manufacturers:</strong> {{ num_manufacturers }}</li>
</ul>

<p class="mt-4">You have visited this page
<span class="badge badge-secondary">{{ num_visits }}</span> time{{ num_visits|pluralize }}.
</p>
</div>
{% endblock %}
16 changes: 16 additions & 0 deletions templates/taxi/manufacturer_confirm_delete.html
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
{% extends "base.html" %}

{% block content %}
<div class="container text-center mt-5">
<h1 class="display-4 text-danger">Delete Manufacturer</h1>
<p class="mt-4">Are you sure you want to delete the following manufacturer?</p>
<div class="alert alert-warning" role="alert">
{{ manufacturer }}
</div>
<form action="" method="post">
{% csrf_token %}
<button type="submit" class="btn btn-danger btn-lg mt-4">Confirm Delete</button>
</form>
<a href="{% url 'taxi:car-list' %}" class="btn btn-primary btn-lg mt-4">Cancel</a>
</div>
{% endblock %}
Loading