diff --git a/taxi/urls.py b/taxi/urls.py index c663d6e22..a8981c334 100644 --- a/taxi/urls.py +++ b/taxi/urls.py @@ -4,9 +4,15 @@ index, CarListView, CarDetailView, + CarCreateView, + CarUpdateView, + CarDeleteView, DriverListView, DriverDetailView, ManufacturerListView, + ManufacturerCreateView, + ManufacturerUpdateView, + ManufacturerDeleteView, ) urlpatterns = [ @@ -16,8 +22,26 @@ ManufacturerListView.as_view(), name="manufacturer-list", ), + path( + "manufacturers/create/", + ManufacturerCreateView.as_view(), + name="manufacturer-create" + ), + path( + "manufacturers//update/", + ManufacturerUpdateView.as_view(), + name="manufacturer-update" + ), + path( + "manufacturers//delete/", + ManufacturerDeleteView.as_view(), + name="manufacturer-delete" + ), path("cars/", CarListView.as_view(), name="car-list"), path("cars//", CarDetailView.as_view(), name="car-detail"), + path("cars/create/", CarCreateView.as_view(), name="car-create"), + path("cars//update/", CarUpdateView.as_view(), name="car-update"), + path("cars//delete/", CarDeleteView.as_view(), name="car-delete"), path("drivers/", DriverListView.as_view(), name="driver-list"), path( "drivers//", DriverDetailView.as_view(), name="driver-detail" diff --git a/taxi/views.py b/taxi/views.py index 4a99a2cd9..e832b77dd 100644 --- a/taxi/views.py +++ b/taxi/views.py @@ -1,5 +1,6 @@ from django.contrib.auth.decorators import login_required from django.shortcuts import render +from django.urls import reverse_lazy from django.views import generic from django.contrib.auth.mixins import LoginRequiredMixin @@ -34,6 +35,26 @@ class ManufacturerListView(LoginRequiredMixin, generic.ListView): paginate_by = 5 +class ManufacturerCreateView(LoginRequiredMixin, generic.CreateView): + model = Manufacturer + fields = "__all__" + template_name = "taxi/manufacturer_form.html" + success_url = reverse_lazy("taxi:manufacturer-list") + + +class ManufacturerUpdateView(LoginRequiredMixin, generic.UpdateView): + model = Manufacturer + fields = "__all__" + template_name = "taxi/manufacturer_form.html" + success_url = reverse_lazy("taxi:manufacturer-list") + + +class ManufacturerDeleteView(LoginRequiredMixin, generic.DeleteView): + model = Manufacturer + success_url = reverse_lazy("taxi:manufacturer-list") + template_name = "taxi/manufacturer_confirm_delete.html" + + class CarListView(LoginRequiredMixin, generic.ListView): model = Car paginate_by = 5 @@ -44,6 +65,26 @@ class CarDetailView(LoginRequiredMixin, generic.DetailView): model = Car +class CarCreateView(LoginRequiredMixin, generic.CreateView): + model = Car + fields = "__all__" + template_name = "taxi/car_form.html" + success_url = reverse_lazy("taxi:car-list") + + +class CarUpdateView(LoginRequiredMixin, generic.UpdateView): + model = Car + fields = "__all__" + template_name = "taxi/car_form.html" + success_url = reverse_lazy("taxi:car-list") + + +class CarDeleteView(LoginRequiredMixin, 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 diff --git a/taxi_service/settings.py b/taxi_service/settings.py index d89c45643..8f98f33e6 100644 --- a/taxi_service/settings.py +++ b/taxi_service/settings.py @@ -43,6 +43,7 @@ "django.contrib.messages", "django.contrib.staticfiles", "debug_toolbar", + "crispy_forms", "taxi", ] @@ -75,6 +76,8 @@ }, ] +CRISPY_TEMPLATE_PACK = "bootstrap4" + WSGI_APPLICATION = "taxi_service.wsgi.application" diff --git a/templates/base.html b/templates/base.html index f4a0b6cfd..3e0343c9e 100644 --- a/templates/base.html +++ b/templates/base.html @@ -6,9 +6,9 @@ + href="https://cdn.jsdelivr.net/npm/bootstrap@4.5.3/dist/css/bootstrap.min.css" + integrity="sha384-TX8t27EcRE3e/ihU7zmQxVncDAy5uIKz4rEkgIXeMed4M0jlfIDPvg6uqKI2xXr2" + crossorigin="anonymous"> {% load static %} diff --git a/templates/includes/sidebar.html b/templates/includes/sidebar.html index 78262d29d..f4d9d710c 100644 --- a/templates/includes/sidebar.html +++ b/templates/includes/sidebar.html @@ -1,9 +1,9 @@
    {% if user.is_authenticated %}
  • User: {{ user.get_username }}
    • -
  • Logout
    • +
  • Logout
    • {% else %} -
  • Login
    • +
  • Login
    • {% endif %}
    diff --git a/templates/registration/logged_out.html b/templates/registration/logged_out.html index c81bd382b..5cbd5c51b 100644 --- a/templates/registration/logged_out.html +++ b/templates/registration/logged_out.html @@ -1,7 +1,7 @@ {% extends "base.html" %} {% block content %} -

    Logged out!

    +

    Logged out!

    -Click here to login again. + Click here to login again. {% endblock %} diff --git a/templates/registration/login.html b/templates/registration/login.html index 29d734ff2..edaefa234 100644 --- a/templates/registration/login.html +++ b/templates/registration/login.html @@ -2,22 +2,22 @@ {% block content %} -{% if form.errors %} -

    Your username and password didn't match. Please try again.

    -{% endif %} + {% if form.errors %} +

    Your username and password didn't match. Please try again.

    + {% endif %} -

    Login

    +

    Login

    -{% if next %} -

    Please login to see this page.

    -{% endif %} + {% if next %} +

    Please login to see this page.

    + {% endif %} -
    -{% csrf_token %} -{{ form.as_p }} + + {% csrf_token %} + {{ form.as_p }} - - -
    + + + {% endblock %} diff --git a/templates/taxi/car_confirm_delete.html b/templates/taxi/car_confirm_delete.html new file mode 100644 index 000000000..375074b85 --- /dev/null +++ b/templates/taxi/car_confirm_delete.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block content %} +

    Delete Car

    + +

    Are you sure want to delete the car: {{ car }}

    + +
    + {% csrf_token %} + +
    +{% endblock %} diff --git a/templates/taxi/car_detail.html b/templates/taxi/car_detail.html index ffdbe7186..102c45705 100644 --- a/templates/taxi/car_detail.html +++ b/templates/taxi/car_detail.html @@ -5,8 +5,8 @@

    Drivers

      - {% for driver in car.drivers.all %} -
    • {{ driver.username }} ({{ driver.first_name }} {{ driver.last_name }})
      • - {% endfor %} + {% for driver in car.drivers.all %} +
    • {{ driver.username }} ({{ driver.first_name }} {{ driver.last_name }})
      • + {% endfor %}
    {% endblock %} diff --git a/templates/taxi/car_form.html b/templates/taxi/car_form.html new file mode 100644 index 000000000..adfb4fc42 --- /dev/null +++ b/templates/taxi/car_form.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% load crispy_forms_filters %} + +{% block content %} +

    {{ object|yesno:"Update,Create" }} Car

    + +
    + {% csrf_token %} + {{ form|crispy }} + + +
    +{% endblock %} diff --git a/templates/taxi/car_list.html b/templates/taxi/car_list.html index e107b5797..101c5578c 100644 --- a/templates/taxi/car_list.html +++ b/templates/taxi/car_list.html @@ -1,16 +1,35 @@ {% extends "base.html" %} {% block content %} -

    Car list

    +

    + Car list + + +

    {% if car_list %} -
      + + + + + + + {% for car in car_list %} -
    • - {{ car.id }} - {{ car.model }} ({{ car.manufacturer.name }}) -
      • + + + + + + {% endfor %} - +
      IDModelUpdateDelete
      + {{ car.id }} + + {{ car.model }} + + Update + + Delete +
      {% else %}

      There are no cars in taxi

      {% endif %} diff --git a/templates/taxi/driver_detail.html b/templates/taxi/driver_detail.html index 788084648..956765337 100644 --- a/templates/taxi/driver_detail.html +++ b/templates/taxi/driver_detail.html @@ -14,10 +14,10 @@

      Cars

      {% for car in driver.cars.all %} -
      -

      Model: {{ car.model }}

      -

      Manufacturer: {{ car.manufacturer.name }}

      -

      Id: {{car.id}}

      +
      +

      Model: {{ car.model }}

      +

      Manufacturer: {{ car.manufacturer.name }}

      +

      Id: {{ car.id }}

      {% empty %}

      No cars!

      diff --git a/templates/taxi/driver_list.html b/templates/taxi/driver_list.html index b740f95ea..c53d55969 100644 --- a/templates/taxi/driver_list.html +++ b/templates/taxi/driver_list.html @@ -1,10 +1,10 @@ {% extends "base.html" %} {% block content %} -

      Driver List -

      +

      Driver List +

      - {% if driver_list %} + {% if driver_list %} @@ -13,18 +13,19 @@

      Driver List

      - {% for driver in driver_list %} - - - - - - - - {% endfor %} + {% for driver in driver_list %} + + + + + + + + {% endfor %}
      IDLast name License number
      {{ driver.id }}{{ driver.username }} {% if user == driver %} (Me){% endif %}{{ driver.first_name }}{{ driver.last_name }}{{ driver.license_number }}
      {{ driver.id }}{{ driver.username }} {% if user == driver %} (Me){% endif %} + {{ driver.first_name }}{{ driver.last_name }}{{ driver.license_number }}
      - {% else %} -

      There are no drivers in the service.

      - {% endif %} + {% else %} +

      There are no drivers in the service.

      + {% endif %} {% endblock %} diff --git a/templates/taxi/manufacturer_confirm_delete.html b/templates/taxi/manufacturer_confirm_delete.html new file mode 100644 index 000000000..3caebce28 --- /dev/null +++ b/templates/taxi/manufacturer_confirm_delete.html @@ -0,0 +1,12 @@ +{% extends "base.html" %} + +{% block content %} +

      Delete Manufacturer

      + +

      Are you sure want to delete the manufacturer: {{ manufacturer }}

      + +
      + {% csrf_token %} + +
      +{% endblock %} diff --git a/templates/taxi/manufacturer_form.html b/templates/taxi/manufacturer_form.html new file mode 100644 index 000000000..1a16a9667 --- /dev/null +++ b/templates/taxi/manufacturer_form.html @@ -0,0 +1,13 @@ +{% extends "base.html" %} +{% load crispy_forms_filters %} + +{% block content %} +

      {{ object|yesno:"Update,Create" }} Manufacturer

      + +
      + {% csrf_token %} + {{ form|crispy }} + + +
      +{% endblock %} diff --git a/templates/taxi/manufacturer_list.html b/templates/taxi/manufacturer_list.html index 2a31bcf60..21d4d775b 100644 --- a/templates/taxi/manufacturer_list.html +++ b/templates/taxi/manufacturer_list.html @@ -1,33 +1,43 @@ {% extends "base.html" %} {% block content %} -

      Manufacturer List -

      +

      + Manufacturer List + + +

      - {% if manufacturer_list %} - + {% if manufacturer_list %} +
      + + + + + + + + + {% for manufacturer in manufacturer_list %} - - - + + + + + + {% endfor %} +
      IDNameCountryUpdateDelete
      IDNameCountry + {{ manufacturer.id }} + + {{ manufacturer.name }} + + {{ manufacturer.country }} + + Update + + Delete +
      - {% for manufacturer in manufacturer_list %} - - - {{ manufacturer.id }} - - - {{ manufacturer.name }} - - - {{ manufacturer.country }} - - - {% endfor %} - - - {% else %} -

      There are no manufacturers in the service.

      - {% endif %} + {% else %} +

      There are no manufacturers in the service.

      + {% endif %} {% endblock %}