From f8ff0b205e7cb9b6ff67aec9106e7f2c4e201838 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 08:28:32 +0300
Subject: [PATCH 01/19] test

---
 FRONTEND/fastparking/accounts/forms.py        | 17 ++++++
 .../accounts/templates/accounts/profile.html  | 39 +++++++-----
 FRONTEND/fastparking/accounts/urls.py         | 21 +++++--
 FRONTEND/fastparking/accounts/views.py        | 39 +++++++++---
 FRONTEND/fastparking/cars/forms.py            |  4 +-
 .../cars/migrations/0001_initial.py           | 14 ++---
 ...ar_blocked_remove_car_pay_pass_and_more.py | 46 --------------
 ...o_car_photo_car_car_paypass_car_blocked.py | 28 +++++++++
 FRONTEND/fastparking/cars/models.py           | 29 ++++++---
 FRONTEND/fastparking/finance/admin.py         | 35 ++++++++++-
 .../finance/migrations/0001_initial.py        | 35 +++++++++++
 FRONTEND/fastparking/finance/models.py        | 20 +++++-
 .../finance/templates/finance/tariff.html     |  0
 .../parking/migrations/0001_initial.py        | 46 ++++++++++++++
 FRONTEND/fastparking/parking/models.py        | 31 +++++++++-
 .../parking/templates/parking/base.html       |  1 +
 FRONTEND/fastparking/photos/forms.py          |  9 +++
 .../photos/migrations/0001_initial.py         |  2 +-
 FRONTEND/fastparking/photos/models.py         |  2 +-
 FRONTEND/fastparking/photos/repository.py     | 61 +++++++++++++++++++
 .../photos/templates/photos/main.html         |  4 ++
 .../photos/templates/photos/upload.html       | 18 ++++++
 FRONTEND/fastparking/photos/urls.py           |  7 ++-
 FRONTEND/fastparking/photos/views.py          | 36 ++++++++++-
 FRONTEND/fastparking/users/forms.py           | 11 +++-
 .../users/migrations/0001_initial.py          |  4 +-
 ..._remove_customuser_cars_customuser_cars.py | 22 +++++++
 FRONTEND/fastparking/users/models.py          | 38 ++----------
 .../users/templates/users/add_car.html        | 16 +++++
 FRONTEND/fastparking/users/views.py           | 29 +++++++++
 30 files changed, 526 insertions(+), 138 deletions(-)
 create mode 100644 FRONTEND/fastparking/accounts/forms.py
 delete mode 100644 FRONTEND/fastparking/cars/migrations/0002_remove_car_blocked_remove_car_pay_pass_and_more.py
 create mode 100644 FRONTEND/fastparking/cars/migrations/0002_rename_photo_car_photo_car_car_paypass_car_blocked.py
 create mode 100644 FRONTEND/fastparking/finance/migrations/0001_initial.py
 create mode 100644 FRONTEND/fastparking/finance/templates/finance/tariff.html
 create mode 100644 FRONTEND/fastparking/parking/migrations/0001_initial.py
 create mode 100644 FRONTEND/fastparking/photos/forms.py
 create mode 100644 FRONTEND/fastparking/photos/repository.py
 create mode 100644 FRONTEND/fastparking/photos/templates/photos/upload.html
 create mode 100644 FRONTEND/fastparking/users/migrations/0002_remove_customuser_cars_customuser_cars.py
 create mode 100644 FRONTEND/fastparking/users/templates/users/add_car.html

diff --git a/FRONTEND/fastparking/accounts/forms.py b/FRONTEND/fastparking/accounts/forms.py
new file mode 100644
index 00000000..edd4d565
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/forms.py
@@ -0,0 +1,17 @@
+from django import forms
+from cars.models import Car 
+
+class CarForm(forms.ModelForm):
+    class Meta:
+        model = Car
+        fields = ['photo_car', 'car_number', 'predict']
+        labels = {
+            'photo_car': 'Photo',
+            'car_number': 'Car Number',
+            'predict': 'Prediction',
+        }
+        widgets = {
+            'photo_car': forms.FileInput(attrs={'class': 'form-control-file'}),
+            'car_number': forms.TextInput(attrs={'class': 'form-control'}),
+            'predict': forms.NumberInput(attrs={'class': 'form-control'}),
+        }
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/profile.html b/FRONTEND/fastparking/accounts/templates/accounts/profile.html
index 5a5779b8..d2f922b6 100644
--- a/FRONTEND/fastparking/accounts/templates/accounts/profile.html
+++ b/FRONTEND/fastparking/accounts/templates/accounts/profile.html
@@ -1,15 +1,24 @@
-{% comment %} <!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>User Profile</title>
-</head>
-<body>
-    <h1>User Profile</h1>
-    <p>Username: {{ request.user.username }}</p>
-    <p>Email: {{ request.user.email }}</p>
-    <!-- Додайте інші дані профілю користувача, які вам потрібні -->
-</body>
-</html> {% endcomment %}
-{% extends "parking/base.html" %}
\ No newline at end of file
+<!-- profile.html -->
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container">
+    <h1>Welcome to your profile</h1>
+
+    <!-- Display user's cars -->
+    <h2>Your Cars</h2>
+    <ul>
+        {% for car in user_cars %}
+            <li>{{ car.car_number }}</li>
+        {% endfor %}
+    </ul>
+
+    <!-- Form to add a new car -->
+    <h2>Add a New Car</h2>
+    <form method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Add Car</button>
+    </form>
+</div>
+{% endblock %}
diff --git a/FRONTEND/fastparking/accounts/urls.py b/FRONTEND/fastparking/accounts/urls.py
index 0bf7695b..3e2dace0 100644
--- a/FRONTEND/fastparking/accounts/urls.py
+++ b/FRONTEND/fastparking/accounts/urls.py
@@ -1,11 +1,22 @@
 # У вашому файлі urls.py у додатку accounts
 
+# from django.urls import path
+# from . import views
+
+# urlpatterns = [
+#     # Інші URL-шляхи вашого додатку...
+
+#     # URL-шлях для сторінки профілю користувача
+#     path('profile/', views.profile_view, name='profile'),
+# ]
+
+# accounts/urls.py
 from django.urls import path
-from . import views
+from .views import CabinetView
 
-urlpatterns = [
-    # Інші URL-шляхи вашого додатку...
+app_name = 'accounts'
 
-    # URL-шлях для сторінки профілю користувача
-    path('profile/', views.profile_view, name='profile'),
+urlpatterns = [
+    path('cabinet/', CabinetView.as_view(), name='cabinet'),
+    # Додайте інші URL-шляхи, якщо потрібно
 ]
diff --git a/FRONTEND/fastparking/accounts/views.py b/FRONTEND/fastparking/accounts/views.py
index 5688e137..14ff4316 100644
--- a/FRONTEND/fastparking/accounts/views.py
+++ b/FRONTEND/fastparking/accounts/views.py
@@ -1,9 +1,34 @@
-# У вашому файлі views.py у додатку accounts
-
-from django.shortcuts import render
+from django.shortcuts import render, redirect
 from django.contrib.auth.decorators import login_required
+from django.views import View
+from django.utils.decorators import method_decorator
+from .forms import CarForm
+
+# @method_decorator(login_required, name='dispatch')
+# class CabinetView(View):
+#     def get(self, request, *args, **kwargs):
+#         # Отримуємо всі автомобілі поточного користувача
+#         user_cars = request.user.cars_set.all()
+#         # Передаємо список автомобілів у шаблон
+#         return render(request, 'accounts/profile.html', {'user_cars': user_cars})
+@method_decorator(login_required, name='dispatch')
+class CabinetView(View):
+    def get(self, request, *args, **kwargs):
+        # Отримуємо всі автомобілі поточного користувача
+        user_cars = request.user.cars.all()
+        # Передаємо список автомобілів у шаблон
+        return render(request, 'accounts/profile.html', {'user_cars': user_cars})
+
+    def post(self, request, *args, **kwargs):
+        # Обробка POST-запиту для додавання автомобіля
+        form = CarForm(request.POST, request.FILES)
+        if form.is_valid():
+            car = form.save(commit=False)
+            car.user = request.user
+            car.save()
+            return redirect('cabinet')
+        else:
+            # Якщо форма недійсна, повертаємо її разом з помилками
+            return render(request, 'accounts/profile.html', {'form': form})
+
 
-@login_required
-def profile_view(request):
-    # Ваш код для відображення сторінки профілю користувача
-    return render(request, 'accounts/profile.html')
diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index 5c1b28e5..a9a16548 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -5,7 +5,7 @@
 class CarForm(forms.ModelForm):
     class Meta:
         model = Car
-        fields = ['car_number', 'photo_car', 'predict', 'blocked', 'pay_pass', 'user']  # Перерахуйте всі поля, які ви хочете відображати у формі
+        fields = ['car_number', 'predict', 'blocked', 'pay_pass']  # Перерахуйте всі поля, які ви хочете відображати у формі
 
         widgets = {
             'car_number': forms.TextInput(attrs={'class': 'form-control'}),
@@ -13,5 +13,5 @@ class Meta:
             'predict': forms.NumberInput(attrs={'class': 'form-control'}),
             'blocked': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
             'pay_pass': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
-            'user': forms.Select(attrs={'class': 'form-select'})
+            # 'user': forms.Select(attrs={'class': 'form-select'})
         }
diff --git a/FRONTEND/fastparking/cars/migrations/0001_initial.py b/FRONTEND/fastparking/cars/migrations/0001_initial.py
index 1f83b855..3bbb10ac 100644
--- a/FRONTEND/fastparking/cars/migrations/0001_initial.py
+++ b/FRONTEND/fastparking/cars/migrations/0001_initial.py
@@ -1,7 +1,6 @@
-# Generated by Django 5.0.4 on 2024-04-10 16:57
+# Generated by Django 5.0.4 on 2024-04-13 11:59
 
 import django.db.models.deletion
-from django.conf import settings
 from django.db import migrations, models
 
 
@@ -10,7 +9,7 @@ class Migration(migrations.Migration):
     initial = True
 
     dependencies = [
-        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+        ('photos', '0001_initial'),
     ]
 
     operations = [
@@ -18,12 +17,9 @@ class Migration(migrations.Migration):
             name='Car',
             fields=[
                 ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
-                ('photo_car', models.ImageField(blank=True, null=True, upload_to='car_photos/')),
-                ('car_number', models.CharField(max_length=20)),
-                ('predict', models.FloatField(blank=True, null=True)),
-                ('blocked', models.BooleanField(default=False)),
-                ('pay_pass', models.BooleanField(default=False)),
-                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+                ('car_number', models.CharField(max_length=16, null=True)),
+                ('predict', models.FloatField(null=True)),
+                ('photo', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='photos.photo')),
             ],
         ),
     ]
diff --git a/FRONTEND/fastparking/cars/migrations/0002_remove_car_blocked_remove_car_pay_pass_and_more.py b/FRONTEND/fastparking/cars/migrations/0002_remove_car_blocked_remove_car_pay_pass_and_more.py
deleted file mode 100644
index af56300b..00000000
--- a/FRONTEND/fastparking/cars/migrations/0002_remove_car_blocked_remove_car_pay_pass_and_more.py
+++ /dev/null
@@ -1,46 +0,0 @@
-# Generated by Django 5.0.4 on 2024-04-13 06:20
-
-import django.db.models.deletion
-from django.db import migrations, models
-
-
-class Migration(migrations.Migration):
-
-    dependencies = [
-        ('cars', '0001_initial'),
-        ('photos', '0001_initial'),
-    ]
-
-    operations = [
-        migrations.RemoveField(
-            model_name='car',
-            name='blocked',
-        ),
-        migrations.RemoveField(
-            model_name='car',
-            name='pay_pass',
-        ),
-        migrations.RemoveField(
-            model_name='car',
-            name='photo_car',
-        ),
-        migrations.RemoveField(
-            model_name='car',
-            name='user',
-        ),
-        migrations.AddField(
-            model_name='car',
-            name='photo',
-            field=models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='photos.photo'),
-        ),
-        migrations.AlterField(
-            model_name='car',
-            name='car_number',
-            field=models.CharField(max_length=16, null=True),
-        ),
-        migrations.AlterField(
-            model_name='car',
-            name='predict',
-            field=models.FloatField(null=True),
-        ),
-    ]
diff --git a/FRONTEND/fastparking/cars/migrations/0002_rename_photo_car_photo_car_car_paypass_car_blocked.py b/FRONTEND/fastparking/cars/migrations/0002_rename_photo_car_photo_car_car_paypass_car_blocked.py
new file mode 100644
index 00000000..ba38e626
--- /dev/null
+++ b/FRONTEND/fastparking/cars/migrations/0002_rename_photo_car_photo_car_car_paypass_car_blocked.py
@@ -0,0 +1,28 @@
+# Generated by Django 5.0.4 on 2024-04-13 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cars', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RenameField(
+            model_name='car',
+            old_name='photo',
+            new_name='photo_car',
+        ),
+        migrations.AddField(
+            model_name='car',
+            name='PayPass',
+            field=models.BooleanField(default=False),
+        ),
+        migrations.AddField(
+            model_name='car',
+            name='blocked',
+            field=models.BooleanField(default=False),
+        ),
+    ]
diff --git a/FRONTEND/fastparking/cars/models.py b/FRONTEND/fastparking/cars/models.py
index 4a5befc9..32f994d5 100644
--- a/FRONTEND/fastparking/cars/models.py
+++ b/FRONTEND/fastparking/cars/models.py
@@ -1,23 +1,32 @@
 from django.urls import reverse
-from django.db import models
+
 from django.conf import settings
+
+
+
+from django.db import models
 from photos.models import Photo
 
 class Car(models.Model):
-    photo = models.ForeignKey(Photo, on_delete=models.SET_NULL, null=True)
     car_number = models.CharField(max_length=16, null=True)
+    photo_car = models.ForeignKey(Photo, on_delete=models.SET_NULL, null=True)
     predict = models.FloatField(null=True)
+    PayPass = models.BooleanField(default=False)
+    blocked = models.BooleanField(default=False)
+
+    def __str__(self):
+        return self.car_number
 
+    def __str__(self):
+        return self.car_number
     def save(self, *args, **kwargs):
-        if self.photo:
-            self.car_number = self.photo.recognized_car_number
-            self.predict = self.photo.accuracy
+        if self.photo_car:
+            self.car_number = self.photo_car.recognized_car_number
+            self.predict = self.photo_car.accuracy
         super().save(*args, **kwargs)
 
-
-   
-
     def __str__(self):
         return self.car_number
-def get_absolute_url(self):
-    return reverse("car_list", kwargs={"pk": self.pk})
+
+    def get_absolute_url(self):
+        return reverse("car_list", kwargs={"pk": self.pk})
diff --git a/FRONTEND/fastparking/finance/admin.py b/FRONTEND/fastparking/finance/admin.py
index 8c38f3f3..15538594 100644
--- a/FRONTEND/fastparking/finance/admin.py
+++ b/FRONTEND/fastparking/finance/admin.py
@@ -1,3 +1,36 @@
 from django.contrib import admin
 
-# Register your models here.
+from .models import Tariff
+from .models import Payment
+
+admin.site.register(Tariff)
+admin.site.register(Payment)
+# from django.contrib import admin
+# from .models import Tariff, Payment
+
+# class TariffAdmin(admin.ModelAdmin):
+#     list_display = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
+#     readonly_fields = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
+
+# class PaymentAdmin(admin.ModelAdmin):
+#     list_display = ['user', 'event_id', 'amount', 'datetime']
+#     readonly_fields = ['user', 'event_id', 'amount', 'datetime']
+
+# admin.site.register(Tariff, TariffAdmin)
+# admin.site.register(Payment, PaymentAdmin)
+# from django.contrib import admin
+# from .models import Payment
+# from users.models import CustomUser  # Припущення: така структура вашої моделі користувача
+
+# class PaymentAdmin(admin.ModelAdmin):
+#     list_display = ['get_username', 'event_id', 'amount', 'datetime']
+#     readonly_fields = ['user', 'event_id', 'amount', 'datetime']
+
+#     def get_username(self, obj):
+#         if obj.user:
+#             return obj.user.username
+#         return None
+
+#     get_username.short_description = 'Username'
+
+# admin.site.register(Payment, PaymentAdmin)
diff --git a/FRONTEND/fastparking/finance/migrations/0001_initial.py b/FRONTEND/fastparking/finance/migrations/0001_initial.py
new file mode 100644
index 00000000..60c4a2f2
--- /dev/null
+++ b/FRONTEND/fastparking/finance/migrations/0001_initial.py
@@ -0,0 +1,35 @@
+# Generated by Django 5.0.4 on 2024-04-13 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='Payment',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('user_id', models.IntegerField(blank=True, null=True)),
+                ('registration_id', models.IntegerField()),
+                ('amount', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('datetime', models.DateTimeField()),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Tariff',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('description', models.CharField(max_length=255)),
+                ('price_per_hour', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('price_per_day', models.DecimalField(decimal_places=2, max_digits=10)),
+                ('start_date', models.DateTimeField()),
+                ('end_date', models.DateTimeField(default='2999-01-01 00:00:00')),
+            ],
+        ),
+    ]
diff --git a/FRONTEND/fastparking/finance/models.py b/FRONTEND/fastparking/finance/models.py
index 71a83623..2edca61a 100644
--- a/FRONTEND/fastparking/finance/models.py
+++ b/FRONTEND/fastparking/finance/models.py
@@ -1,3 +1,21 @@
 from django.db import models
 
-# Create your models here.
+class Tariff(models.Model):
+    description = models.CharField(max_length=255)
+    price_per_hour = models.DecimalField(max_digits=10, decimal_places=2)
+    price_per_day = models.DecimalField(max_digits=10, decimal_places=2)
+    start_date = models.DateTimeField()
+    end_date = models.DateTimeField(default="2999-01-01 00:00:00")
+
+    def __str__(self):
+        return self.description
+
+class Payment(models.Model):
+    user_id = models.IntegerField(blank=True, null=True)  # ID користувача, який здійснив оплату (не обов'язкове)
+    registration_id = models.IntegerField()  # ID реєстрації, за яку здійснюється оплата
+    amount = models.DecimalField(max_digits=10, decimal_places=2)
+    datetime = models.DateTimeField()
+
+    def __str__(self):
+        return f"Payment {self.id}"
+
diff --git a/FRONTEND/fastparking/finance/templates/finance/tariff.html b/FRONTEND/fastparking/finance/templates/finance/tariff.html
new file mode 100644
index 00000000..e69de29b
diff --git a/FRONTEND/fastparking/parking/migrations/0001_initial.py b/FRONTEND/fastparking/parking/migrations/0001_initial.py
new file mode 100644
index 00000000..6887cc6d
--- /dev/null
+++ b/FRONTEND/fastparking/parking/migrations/0001_initial.py
@@ -0,0 +1,46 @@
+# Generated by Django 5.0.4 on 2024-04-13 19:19
+
+import django.db.models.deletion
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    initial = True
+
+    dependencies = [
+        ('cars', '0002_rename_photo_car_photo_car_car_paypass_car_blocked'),
+        ('finance', '0001_initial'),
+        ('photos', '0001_initial'),
+        migrations.swappable_dependency(settings.AUTH_USER_MODEL),
+    ]
+
+    operations = [
+        migrations.CreateModel(
+            name='ParkingSpace',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('number', models.CharField(max_length=10, unique=True)),
+                ('status', models.BooleanField(default=False)),
+                ('user', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to=settings.AUTH_USER_MODEL)),
+            ],
+        ),
+        migrations.CreateModel(
+            name='Registration',
+            fields=[
+                ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+                ('entry_datetime', models.DateTimeField(auto_now_add=True)),
+                ('car_number_in', models.CharField(max_length=16)),
+                ('exit_datetime', models.DateTimeField(blank=True, null=True)),
+                ('invoice', models.CharField(blank=True, max_length=255, null=True)),
+                ('car_number_out', models.CharField(blank=True, max_length=16, null=True)),
+                ('car', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='cars.car')),
+                ('parking', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, to='parking.parkingspace')),
+                ('payment', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='finance.payment')),
+                ('photo_in', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='entry_photo', to='photos.photo')),
+                ('photo_out', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='exit_photo', to='photos.photo')),
+                ('tariff', models.ForeignKey(null=True, on_delete=django.db.models.deletion.SET_NULL, to='finance.tariff')),
+            ],
+        ),
+    ]
diff --git a/FRONTEND/fastparking/parking/models.py b/FRONTEND/fastparking/parking/models.py
index 71a83623..b7266964 100644
--- a/FRONTEND/fastparking/parking/models.py
+++ b/FRONTEND/fastparking/parking/models.py
@@ -1,3 +1,32 @@
 from django.db import models
+from cars.models import Car
+from finance.models import Tariff
+from finance.models import Payment
+from users.models import CustomUser
+from photos.models import Photo
+
+
+class ParkingSpace(models.Model):
+    number = models.CharField(max_length=10, unique=True)
+    status = models.BooleanField(default=False)  # False - вільно, True - зайнято
+    user = models.ForeignKey(CustomUser, on_delete=models.SET_NULL, null=True, blank=True)
+
+    def __str__(self):
+        return self.number
+class Registration(models.Model):
+    parking = models.ForeignKey(ParkingSpace, on_delete=models.CASCADE)
+    entry_datetime = models.DateTimeField(auto_now_add=True)
+    car_number_in = models.CharField(max_length=16)
+    tariff = models.ForeignKey(Tariff, on_delete=models.SET_NULL, null=True)
+    exit_datetime = models.DateTimeField(null=True, blank=True)
+    invoice = models.CharField(max_length=255, null=True, blank=True)
+    payment = models.ForeignKey(Payment, on_delete=models.SET_NULL, null=True, blank=True)
+    car_number_out = models.CharField(max_length=16, null=True, blank=True)
+    photo_in = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name=type, null=True, blank=True)
+    photo_out = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name=type, null=True, blank=True)
+    car = models.ForeignKey(Car, on_delete=models.SET_NULL, null=True, blank=True)
+
+    def __str__(self):
+        return f"Registration ID: {self.id} - Parking ID: {self.parking_id} - Entry Time: {self.entry_datetime}"
+
 
-# Create your models here.
diff --git a/FRONTEND/fastparking/parking/templates/parking/base.html b/FRONTEND/fastparking/parking/templates/parking/base.html
index 99e0fe04..c14bc420 100644
--- a/FRONTEND/fastparking/parking/templates/parking/base.html
+++ b/FRONTEND/fastparking/parking/templates/parking/base.html
@@ -38,6 +38,7 @@ <h1 class="visually-hidden">Sidebars examples</h1>
         </a>
       </li>
       {% if user.is_authenticated %}
+      <li><a href="/accounts/cabinet/">Profile</a></li>
       <li>
         <a class="nav-link text-white" href="/cars/">
           <i class="fa-solid fa-car"></i>
diff --git a/FRONTEND/fastparking/photos/forms.py b/FRONTEND/fastparking/photos/forms.py
new file mode 100644
index 00000000..3e1cd17b
--- /dev/null
+++ b/FRONTEND/fastparking/photos/forms.py
@@ -0,0 +1,9 @@
+from django import forms
+from django.contrib.auth.forms import UserCreationForm, AuthenticationForm
+from django.contrib.auth.models import User
+
+
+class UploadFileForm(forms.Form):
+    choices = [("0", "IN"), ("1", "OUT")]
+    type = forms.ChoiceField(choices=choices)
+    photo = forms.ImageField()
diff --git a/FRONTEND/fastparking/photos/migrations/0001_initial.py b/FRONTEND/fastparking/photos/migrations/0001_initial.py
index 81727b3e..92651cfc 100644
--- a/FRONTEND/fastparking/photos/migrations/0001_initial.py
+++ b/FRONTEND/fastparking/photos/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.4 on 2024-04-13 06:20
+# Generated by Django 5.0.4 on 2024-04-13 11:59
 
 from django.db import migrations, models
 
diff --git a/FRONTEND/fastparking/photos/models.py b/FRONTEND/fastparking/photos/models.py
index b7c7ced4..05e04f8e 100644
--- a/FRONTEND/fastparking/photos/models.py
+++ b/FRONTEND/fastparking/photos/models.py
@@ -1,6 +1,6 @@
 from django.db import models
 from django.conf import settings
-from django.contrib.auth.models import User
+from users.models import CustomUser
 
 
 class Photo(models.Model):
diff --git a/FRONTEND/fastparking/photos/repository.py b/FRONTEND/fastparking/photos/repository.py
new file mode 100644
index 00000000..3d5a73fc
--- /dev/null
+++ b/FRONTEND/fastparking/photos/repository.py
@@ -0,0 +1,61 @@
+import base64
+from datetime import datetime
+from pathlib import Path
+from django.conf import settings
+
+from ds.predict_num import get_num_auto_png_io
+
+from .models import Photo
+
+TYPES = {"0": "IN", "1": "OUT"}
+
+
+def save_prediction(predict: dict, type: str) -> None:
+    num_auto = predict.get("num_avto_str")
+    accuracy = predict.get("accuracy")
+    num_img = predict.get("num_img")
+    if num_auto:
+        record = Photo()
+        record.recognized_car_number = num_auto
+        record.accuracy = accuracy
+        record.photo = num_img
+        record.type = type
+        record.save()
+
+
+def save_image(f, type: str = "", filepath: Path | None = None):
+    if filepath is None:
+        if settings.MEDIA_ROOT:
+            utc_datetime = datetime.utcnow()
+            file_date = utc_datetime.strftime("%Y%m%d%H%M%S")
+            media: Path = settings.MEDIA_ROOT.joinpath("photos").joinpath(
+                TYPES.get(type)
+            )
+            media.mkdir(parents=True, exist_ok=True)
+            image_type = "jpg"
+            filepath = media.joinpath(f"{file_date}.{image_type}")
+    if f and filepath:
+        with filepath.open("wb+") as destination:
+            for chunk in f.chunks():
+                destination.write(chunk)
+
+
+def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
+    if f and type:
+        info = f"File accepted, sizes: {len(f) // 1024} KB, {type=}"
+        #  try to save
+        # try:
+        #  save_image(f, type=type)
+        # except Exception:
+        #     ...
+
+        # analyze and calculate prediction of image
+        predict = get_num_auto_png_io(f.read())
+        # store information to database
+        save_prediction(predict, type)
+        # prepare for show on web page
+        binary_image_data = predict.get("num_img")
+        if binary_image_data:
+            base64_image = base64.b64encode(binary_image_data).decode("utf-8")
+            predict["num_img"] = base64_image
+        return {"info": info, "predict": predict}
diff --git a/FRONTEND/fastparking/photos/templates/photos/main.html b/FRONTEND/fastparking/photos/templates/photos/main.html
index defe0f1a..c43dccbd 100644
--- a/FRONTEND/fastparking/photos/templates/photos/main.html
+++ b/FRONTEND/fastparking/photos/templates/photos/main.html
@@ -1,2 +1,6 @@
 <!-- finance/templates/finance/main.html -->
 {% extends "parking/base.html" %}
+{% block content %}
+    <title>Title</title>
+    <a href="upload">Upload</a>
+{% endblock content %}
\ No newline at end of file
diff --git a/FRONTEND/fastparking/photos/templates/photos/upload.html b/FRONTEND/fastparking/photos/templates/photos/upload.html
new file mode 100644
index 00000000..e74d195c
--- /dev/null
+++ b/FRONTEND/fastparking/photos/templates/photos/upload.html
@@ -0,0 +1,18 @@
+<!-- photos/templates/upload.html -->
+{% extends "parking/base.html" %}
+{% block content %}
+    <h1>Upload photo</h1>
+    <form method="POST" action="" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <input type="submit" value="Submit">
+    </form>
+{% if info %}
+   <h2>RESULT:</h2>
+    <p>info: {{ info }}</p>
+    <p>number: {{ predict.num_avto_str }}</p>
+    <p>accuracy: {{ predict.accuracy }}</p>
+    img: <img src="data:image/jpeg;base64,{{ predict.num_img }}">
+{% endif %}
+{% endblock content %}
+
diff --git a/FRONTEND/fastparking/photos/urls.py b/FRONTEND/fastparking/photos/urls.py
index 060f75c7..bcb81ec9 100644
--- a/FRONTEND/fastparking/photos/urls.py
+++ b/FRONTEND/fastparking/photos/urls.py
@@ -3,8 +3,9 @@
 from django.urls import path
 from . import views
 
-app_name = 'photos'
+app_name = "photos"
 
 urlpatterns = [
-    path('', views.main, name='main'),
-]
\ No newline at end of file
+    path("", views.main, name="main"),
+    path("upload", views.upload_file, name="upload"),
+]
diff --git a/FRONTEND/fastparking/photos/views.py b/FRONTEND/fastparking/photos/views.py
index 41a43525..91b98328 100644
--- a/FRONTEND/fastparking/photos/views.py
+++ b/FRONTEND/fastparking/photos/views.py
@@ -1,5 +1,39 @@
+from django.http import HttpResponseRedirect
 from django.shortcuts import render
+from .forms import UploadFileForm
+from django.urls import reverse
+
+
+# Imaginary function to handle an uploaded file.
+from .repository import handle_uploaded_file
+
+
+def upload_file(request):
+    if request.method == "POST":
+        form = UploadFileForm(request.POST, request.FILES)
+        if form.is_valid():
+            type_of_photo = request.POST.get("type")
+            file_in = request.FILES.get("photo")
+            if file_in:
+                img_predict = handle_uploaded_file(file_in, type_of_photo)
+                info = img_predict.get("info")
+                predict = img_predict.get("predict")
+                # print(f"{info}")
+                if info:
+                    return render(
+                        request,
+                        "photos/upload.html",
+                        {"form": form, "info": info, "predict": predict},
+                    )
+            # upload_url = reverse("upload")
+            return HttpResponseRedirect("")
+    else:
+        form = UploadFileForm()
+    return render(request, "photos/upload.html", {"form": form})
+
 
 def main(request):
     # ваш код для обробки запиту тут
-    return render(request, 'photos/main.html')  # або інша логіка відповідно до вашого проекту
\ No newline at end of file
+    return render(
+        request, "photos/main.html"
+    )  # або інша логіка відповідно до вашого проекту
\ No newline at end of file
diff --git a/FRONTEND/fastparking/users/forms.py b/FRONTEND/fastparking/users/forms.py
index f64c7f0c..2e825b0d 100644
--- a/FRONTEND/fastparking/users/forms.py
+++ b/FRONTEND/fastparking/users/forms.py
@@ -5,6 +5,7 @@
 from django.forms import CharField, TextInput, EmailField, EmailInput, PasswordInput
 from django import forms
 from .models import CustomUser
+from cars.models import Car
 
 class RegisterForm(UserCreationForm):
     username = forms.CharField(max_length=100, required=True, widget=forms.TextInput(attrs={"class": "form-control"}))
@@ -15,11 +16,12 @@ class RegisterForm(UserCreationForm):
     accept_oferta = forms.BooleanField(required=True)
     telegram_nickname = forms.CharField(max_length=20, required=False, widget=forms.TextInput(attrs={"class": "form-control"}))
     telegram_id = forms.CharField(max_length=50, required=False, widget=forms.TextInput(attrs={"class": "form-control"}))
+    # cars = forms.ModelMultipleChoiceField(queryset=Car.objects.all(), required=False)
     class Meta:
         model = get_user_model()  # Змінено з User на CustomUser
+        # fields = ("username", "first_name", "last_name", "email", "phone_number", "accept_oferta", "password1", "password2", "telegram_nickname")
         fields = ("username", "first_name", "last_name", "email", "phone_number", "accept_oferta", "password1", "password2", "telegram_nickname")
 
-
     def save(self, commit=True):
         user = super().save(commit=False)
         if not user.username:  # Якщо користувач не вказав username (нікнейм), використовуємо номер телефону або Telegram нікнейм
@@ -41,3 +43,10 @@ class LoginForm(AuthenticationForm):
     class Meta:
         model = get_user_model()
         fields = ("username", "password")
+
+
+
+class CarAddForm(forms.Form):
+    car_number = forms.CharField(label='Car Number', max_length=16)
+    brand = forms.CharField(label='Brand', max_length=100)
+    car_type = forms.CharField(label='Car Type', max_length=100)
\ No newline at end of file
diff --git a/FRONTEND/fastparking/users/migrations/0001_initial.py b/FRONTEND/fastparking/users/migrations/0001_initial.py
index a57ce9cb..ce950345 100644
--- a/FRONTEND/fastparking/users/migrations/0001_initial.py
+++ b/FRONTEND/fastparking/users/migrations/0001_initial.py
@@ -1,4 +1,4 @@
-# Generated by Django 5.0.4 on 2024-04-12 15:43
+# Generated by Django 5.0.4 on 2024-04-13 11:59
 
 import django.contrib.auth.models
 import django.contrib.auth.validators
@@ -12,6 +12,7 @@ class Migration(migrations.Migration):
 
     dependencies = [
         ('auth', '0012_alter_user_first_name_max_length'),
+        ('cars', '0001_initial'),
     ]
 
     operations = [
@@ -32,6 +33,7 @@ class Migration(migrations.Migration):
                 ('telegram_nickname', models.CharField(blank=True, max_length=20, null=True)),
                 ('phone_number', models.CharField(blank=True, max_length=20, null=True)),
                 ('telegram_id', models.CharField(blank=True, max_length=50, null=True)),
+                ('cars', models.ManyToManyField(blank=True, related_name='owners', to='cars.car')),
                 ('groups', models.ManyToManyField(blank=True, help_text='The groups this user belongs to. A user will get all permissions granted to each of their groups.', related_name='user_set', related_query_name='user', to='auth.group', verbose_name='groups')),
                 ('user_permissions', models.ManyToManyField(blank=True, help_text='Specific permissions for this user.', related_name='user_set', related_query_name='user', to='auth.permission', verbose_name='user permissions')),
             ],
diff --git a/FRONTEND/fastparking/users/migrations/0002_remove_customuser_cars_customuser_cars.py b/FRONTEND/fastparking/users/migrations/0002_remove_customuser_cars_customuser_cars.py
new file mode 100644
index 00000000..61d5bd77
--- /dev/null
+++ b/FRONTEND/fastparking/users/migrations/0002_remove_customuser_cars_customuser_cars.py
@@ -0,0 +1,22 @@
+# Generated by Django 5.0.4 on 2024-04-13 19:19
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customuser',
+            name='cars',
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='cars',
+            field=models.TextField(blank=True, null=True),
+        ),
+    ]
diff --git a/FRONTEND/fastparking/users/models.py b/FRONTEND/fastparking/users/models.py
index 452896b4..71e940f9 100644
--- a/FRONTEND/fastparking/users/models.py
+++ b/FRONTEND/fastparking/users/models.py
@@ -1,43 +1,15 @@
-
-# from django.contrib.auth.models import AbstractUser
-# from django.db import models
-# from django.db.models.signals import post_save
-
-# class CustomUser(AbstractUser):
-#     # telegram_nickname = models.CharField(max_length=20, blank=True, null=True)
-
-#     def __str__(self):
-#         return self.username
-
-# class Profile(models.Model):
-#     user = models.OneToOneField(CustomUser, on_delete=models.CASCADE)
-
-#     def __str__(self):
-#         return self.user.username
-
-# def create_user_profile(sender, instance, created, **kwargs):
-#     if created:
-#         Profile.objects.create(user=instance)
-
-# # Підключення обробника сигналу
-# post_save.connect(create_user_profile, sender=CustomUser)
-
 from django.contrib.auth.models import AbstractUser
 from django.db import models
 from django.db.models.signals import post_save
 from django.dispatch import receiver
+from cars.models import Car
 
 
-# class Profile(models.Model):
-#     user = models.OneToOneField('CustomUser', on_delete=models.CASCADE)
-
-#     def __str__(self):
-#         return self.user.username
-
 class CustomUser(AbstractUser):
+    cars = models.TextField(blank=True, null=True)
     telegram_nickname = models.CharField(max_length=20, blank=True, null=True)
     phone_number = models.CharField(max_length=20, blank=True, null=True)
-    telegram_id = models.CharField(max_length=50,blank=True, null=True)
+    telegram_id = models.CharField(max_length=50, blank=True, null=True)
+    # cars = models.ManyToManyField(Car, related_name='owners', blank=True)  # Додано поле багато-до-багатьох для прив'язки автомобілів до користувача
     def __str__(self):
-        return self.username
-
+        return self.username
\ No newline at end of file
diff --git a/FRONTEND/fastparking/users/templates/users/add_car.html b/FRONTEND/fastparking/users/templates/users/add_car.html
new file mode 100644
index 00000000..86f712af
--- /dev/null
+++ b/FRONTEND/fastparking/users/templates/users/add_car.html
@@ -0,0 +1,16 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>Add Car</title>
+</head>
+<body>
+    <h1>Add a New Car</h1>
+    <form method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Add Car</button>
+    </form>
+</body>
+</html>
\ No newline at end of file
diff --git a/FRONTEND/fastparking/users/views.py b/FRONTEND/fastparking/users/views.py
index e2eb3ead..30119d90 100644
--- a/FRONTEND/fastparking/users/views.py
+++ b/FRONTEND/fastparking/users/views.py
@@ -9,6 +9,9 @@
 from django.contrib.auth import logout
 from django.shortcuts import redirect
 from django.contrib.auth.decorators import login_required
+from django.shortcuts import render, redirect
+from .models import Car
+from .forms import CarAddForm
 
 @login_required
 def logout_view(request):
@@ -43,3 +46,29 @@ class ResetPasswordView(SuccessMessageMixin, PasswordResetView):
     success_url = reverse_lazy('users:password_reset_done')
     success_message = "An email with instructions to reset your password has been sent to %(email)s."
     subject_template_name = 'users/password_reset_subject.txt'
+
+
+
+def add_car(request):
+    if request.method == 'POST':
+        form = CarAddForm(request.POST)
+        if form.is_valid():
+            car_number = form.cleaned_data['car_number']
+            brand = form.cleaned_data['brand']
+            car_type = form.cleaned_data['car_type']
+            
+            # Перевірка наявності автомобіля з введеним номером
+            car = Car.objects.filter(car_number=car_number).first()
+            if car:
+                # Якщо автомобіль існує, прив'яжіть його до поточного користувача
+                car.owners.add(request.user)
+            else:
+                # Якщо автомобіль не існує, створіть новий запис
+                car = Car.objects.create(car_number=car_number, brand=brand, car_type=car_type)
+                car.owners.add(request.user)
+            
+            return redirect('profile')  # Перенаправлення на профіль користувача після успішного додавання автомобіля
+    else:
+        form = CarAddForm()
+    
+    return render(request, 'add_car.html', {'form': form})
\ No newline at end of file

From 23eb903fd63df6894f172003bef1ae8ea36d892b Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 08:36:27 +0300
Subject: [PATCH 02/19] test

---
 FRONTEND/fastparking/communications/admin.py  |  9 +-
 .../communications/migrations/0001_initial.py | 29 ++++++
 .../0002_alter_message_date_displayed.py      | 17 ++++
 FRONTEND/fastparking/communications/models.py |  9 +-
 .../fastparking/communications/send_news.py   | 39 ++++++++
 .../templates/communications/main.html        | 20 ++--
 FRONTEND/fastparking/communications/views.py  | 20 +++-
 FRONTEND/fastparking/ds/predict_num.py        | 93 ++++++++++++++-----
 FRONTEND/fastparking/finance/views.py         |  8 +-
 .../parking/templates/parking/base.html       | 16 ++--
 FRONTEND/fastparking/parking/views.py         |  8 +-
 FRONTEND/fastparking/photos/repository.py     | 26 ++++++
 .../photos/templates/photos/main.html         |  6 ++
 FRONTEND/fastparking/photos/views.py          |  8 +-
 FRONTEND/fastparking/utils/get_news.py        | 60 ++----------
 FRONTEND/fastparking/utils/news.txt           |  2 -
 FRONTEND/fastparking/utils/sheduler.py        | 19 +++-
 FRONTEND/fastparking/utils/telegram_api.py    | 39 +++++---
 .../fastparking/utils/telegram_chanel.txt     |  0
 scripts/cron_loop.sh                          |  2 +-
 scripts/make_migrate_dev_app.sh               |  0
 21 files changed, 304 insertions(+), 126 deletions(-)
 create mode 100644 FRONTEND/fastparking/communications/migrations/0001_initial.py
 create mode 100644 FRONTEND/fastparking/communications/migrations/0002_alter_message_date_displayed.py
 create mode 100644 FRONTEND/fastparking/communications/send_news.py
 delete mode 100644 FRONTEND/fastparking/utils/news.txt
 delete mode 100644 FRONTEND/fastparking/utils/telegram_chanel.txt
 mode change 100644 => 100755 scripts/make_migrate_dev_app.sh

diff --git a/FRONTEND/fastparking/communications/admin.py b/FRONTEND/fastparking/communications/admin.py
index 8c38f3f3..445fff54 100644
--- a/FRONTEND/fastparking/communications/admin.py
+++ b/FRONTEND/fastparking/communications/admin.py
@@ -1,3 +1,10 @@
 from django.contrib import admin
 
-# Register your models here.
+from .models import Message
+
+
+class ModelAdmin(admin.ModelAdmin):
+    list_display = ("date_displayed", "news_text", "is_displayed")
+
+
+admin.site.register(Message, ModelAdmin)
diff --git a/FRONTEND/fastparking/communications/migrations/0001_initial.py b/FRONTEND/fastparking/communications/migrations/0001_initial.py
new file mode 100644
index 00000000..ef2043cb
--- /dev/null
+++ b/FRONTEND/fastparking/communications/migrations/0001_initial.py
@@ -0,0 +1,29 @@
+# Generated by Django 5.0.4 on 2024-04-13 19:16
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    initial = True
+
+    dependencies = []
+
+    operations = [
+        migrations.CreateModel(
+            name="Message",
+            fields=[
+                (
+                    "id",
+                    models.BigAutoField(
+                        auto_created=True,
+                        primary_key=True,
+                        serialize=False,
+                        verbose_name="ID",
+                    ),
+                ),
+                ("date_displayed", models.DateTimeField(auto_now_add=True)),
+                ("news_text", models.TextField()),
+                ("is_displayed", models.BooleanField(default=False)),
+            ],
+        ),
+    ]
diff --git a/FRONTEND/fastparking/communications/migrations/0002_alter_message_date_displayed.py b/FRONTEND/fastparking/communications/migrations/0002_alter_message_date_displayed.py
new file mode 100644
index 00000000..c56a5db4
--- /dev/null
+++ b/FRONTEND/fastparking/communications/migrations/0002_alter_message_date_displayed.py
@@ -0,0 +1,17 @@
+# Generated by Django 5.0.4 on 2024-04-13 21:26
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("communications", "0001_initial"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="message",
+            name="date_displayed",
+            field=models.DateTimeField(blank=True, null=True),
+        ),
+    ]
diff --git a/FRONTEND/fastparking/communications/models.py b/FRONTEND/fastparking/communications/models.py
index 71a83623..8eb15fef 100644
--- a/FRONTEND/fastparking/communications/models.py
+++ b/FRONTEND/fastparking/communications/models.py
@@ -1,3 +1,10 @@
 from django.db import models
 
-# Create your models here.
+
+class Message(models.Model):
+    date_displayed = models.DateTimeField(null=True, blank=True)
+    news_text = models.TextField()
+    is_displayed = models.BooleanField(default=False)
+
+    def __str__(self):
+        return self.news_text
diff --git a/FRONTEND/fastparking/communications/send_news.py b/FRONTEND/fastparking/communications/send_news.py
new file mode 100644
index 00000000..a70ad0c8
--- /dev/null
+++ b/FRONTEND/fastparking/communications/send_news.py
@@ -0,0 +1,39 @@
+from django.db.models import Q
+from django.utils import timezone
+
+from utils.telegram_api import send_message_news
+
+try:
+    from .models import Message
+except ImportError:
+    from models import Message
+
+
+def fetch_unsent_news(max_messages: int = 1):
+    unsent_message = Message.objects.filter(
+        Q(is_displayed=False)
+        & (Q(date_displayed__lte=timezone.now()) | Q(date_displayed__isnull=True))
+    )[:max_messages]
+    return unsent_message
+
+
+def mark_news_as_sent(message):
+    message.is_displayed = True
+    message.date_displayed = timezone.now()
+    message.save()
+
+
+def send_news_to_telegram(max_messages=3, debug=False):
+    unsent_messages = fetch_unsent_news(max_messages)
+    sent_messages = 0
+    for message in unsent_messages:
+        if debug:
+            print(f"{message.date_displayed=}, {timezone.now()=}")
+            print("MESSAGE TO NEWS: ", message.news_text)
+            mark_news_as_sent(message)
+            sent_messages += 1
+        else:
+            if send_message_news(message.news_text):
+                mark_news_as_sent(message)
+                sent_messages += 1
+    return sent_messages
diff --git a/FRONTEND/fastparking/communications/templates/communications/main.html b/FRONTEND/fastparking/communications/templates/communications/main.html
index e238c8ae..147a3907 100644
--- a/FRONTEND/fastparking/communications/templates/communications/main.html
+++ b/FRONTEND/fastparking/communications/templates/communications/main.html
@@ -1,14 +1,10 @@
 <!-- communications/templates/communications/main.html -->
 {% extends "parking/base.html" %}
-<!DOCTYPE html>
-<html lang="en">
-<head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Main Page - Communications</title>
-</head>
-<body>
-    <h1>Main Page - Communications</h1>
-    <p>This is a placeholder for the main page of the communications app.</p>
-</body>
-</html>
+{% block content %}
+<h1>Messages</h1>
+<p>Перевіряємо чи є актуальні новини, і форсуємо їх надіслання до каналу новин.</p>
+Наш канал новин: <a href="https://t.me/{{ news_channel }}">@{{ news_channel }}.</a>
+{% if sent_messages %}
+<p>Надіслано повідомлень: {{ sent_messages }}.</p>
+{% endif%}
+{% endblock content %}
diff --git a/FRONTEND/fastparking/communications/views.py b/FRONTEND/fastparking/communications/views.py
index f810577f..c177f4c6 100644
--- a/FRONTEND/fastparking/communications/views.py
+++ b/FRONTEND/fastparking/communications/views.py
@@ -1,5 +1,23 @@
 from django.shortcuts import render
+from django.conf import settings
+
+from .send_news import send_news_to_telegram
+
+
+def check_news():
+    return send_news_to_telegram()
+
 
 def main(request):
     # ваш код для обробки запиту тут
-    return render(request, 'communications/main.html')  # або інша логіка відповідно до вашого проекту
\ No newline at end of file
+    active_menu = "messages"
+    sent_messages = check_news()
+    return render(
+        request,
+        "communications/main.html",
+        {
+            "active_menu": active_menu,
+            "news_channel": settings.TELEGRAM_NEWS_NAME[1:],
+            "sent_messages": sent_messages,
+        },
+    )  # або інша логіка відповідно до вашого проекту
diff --git a/FRONTEND/fastparking/ds/predict_num.py b/FRONTEND/fastparking/ds/predict_num.py
index 882862db..27549564 100644
--- a/FRONTEND/fastparking/ds/predict_num.py
+++ b/FRONTEND/fastparking/ds/predict_num.py
@@ -1,16 +1,15 @@
 import os
-
-os.environ["TF_ENABLE_ONEDNN_OPTS"] = "0"
-
+import io
+from pathlib import Path
 
 import matplotlib.pyplot as plt
 import numpy as np
 import cv2
 
 # import tensorflow as tf
-from pathlib import Path
 
 
+os.environ["TF_ENABLE_ONEDNN_OPTS"] = "0"
 # from sklearn.metrics import f1_score
 # from keras import optimizers
 # from keras.models import Sequential
@@ -70,7 +69,6 @@ def extract_plate(img, plate_cascade, text=""):
     y_max = 0
 
     for x, y, w, h in plate_rect:
-
         # виконує пропорційне зміщення пікселів
         a, b = (int(0.1 * h), int(0.1 * w))
         aa, bb = (int(0.1 * h), int(0.1 * w))
@@ -106,8 +104,7 @@ def extract_plate(img, plate_cascade, text=""):
 
 
 # Відповідність контурів номерному або символьному шаблону
-def find_contours(dimensions, img):
-
+def find_contours(dimensions, img, debug=False):
     i_width_threshold = 6
 
     # Знайдіть всі контури на зображенні
@@ -180,8 +177,8 @@ def find_contours(dimensions, img):
                 break
 
     # Return characters on ascending order with respect to the x-coordinate (most-left character first)
-
-    plt.show()
+    if debug:
+        plt.show()
     # arbitrary function that stores sorted list of character indeces
     indices = sorted(range(len(x_cntr_list)), key=lambda k: x_cntr_list[k])
     img_res_copy = []
@@ -195,8 +192,7 @@ def find_contours(dimensions, img):
 
 
 # Find characters in the resulting images
-def segment_to_contours(image):
-
+def segment_to_contours(image, debug: bool = False):
     new_height = 75  # set fixed height
     # print("original plate[w,h]:", image.shape[1], image.shape[0], "new_shape:333,", new_height)
 
@@ -219,9 +215,10 @@ def segment_to_contours(image):
 
     # Estimations of character contours sizes of cropped license plates
     dimensions = [LP_WIDTH / 24, LP_WIDTH / 8, LP_HEIGHT / 3, 2 * LP_HEIGHT / 3]
-    # plt.imshow(img_binary_lp, cmap='gray')
-    # plt.title("original plate contour (binary)")
-    # plt.show()
+    # if debug:
+    #     plt.imshow(img_binary_lp, cmap='gray')
+    #     plt.title("original plate contour (binary)")
+    #     plt.show()
 
     # Get contours within cropped license plate
     char_list = find_contours(dimensions, img_binary_lp)
@@ -242,22 +239,30 @@ def predict_result(ch_contours, model):
     for i, c in enumerate(characters):
         dic[i] = c
 
+    total_accuracy = 1.0
+
     output = []
     for i, ch in enumerate(ch_contours):
-
         img_ = cv2.resize(ch, (28, 28))  # interpolation=cv2.INTER_LINEAR by default
 
         img = fix_dimension(img_)
         img = img.reshape(1, 28, 28, 3)  # preparing image for the model
 
-        y_ = np.argmax(model.predict(img, verbose=0), axis=-1)[
-            0
-        ]  # predicting the class
+        prediction = model.predict(img, verbose=0)
+
+        y_ = np.argmax(prediction, axis=-1)[0]  # predicting the class
+
+        # print(y_, prediction.shape, prediction)
         character = dic[y_]
+        # accuracy = prediction[0][y_]
+        # print(f'{accuracy=}')
+        # total_accuracy *= accuracy
+        # print(f'{total_accuracy=}')
+
         output.append(character)
 
     plate_number = "".join(output)
-    return plate_number
+    return plate_number, total_accuracy
 
 
 def get_num_avto(img_avto):
@@ -266,16 +271,55 @@ def get_num_avto(img_avto):
 
     chars = segment_to_contours(num_img)
 
-    predicted_str = predict_result(chars, model)
+    predicted_str, total_accuracy = predict_result(chars, model)
     num_avto_str = str.replace(predicted_str, "#", "")
 
-    return num_avto_str, num_img
+    return {
+        "num_avto_str": num_avto_str,
+        "accuracy": total_accuracy,
+        "num_img": num_img,
+    }
+
+
+def decode_io_file(f):
+    io_buf = io.BytesIO(f)
+    # io_buf.seek(0)
+    decode_img = cv2.imdecode(np.frombuffer(io_buf.getbuffer(), np.uint8), -1)
+    return decode_img
+
+
+def get_num_auto_png_io(f) -> dict:
+    img = decode_io_file(f)
+    return get_num_auto_png(img)
+
+
+def get_num_auto_png(img) -> dict:
+    num_result = get_num_avto(img)
+    img = np.zeros(0)
+    try:
+        is_success, im_buf_arr = cv2.imencode(
+            ".png", num_result["num_img"], params=[cv2.IMWRITE_PNG_COMPRESSION, 5]
+        )
+    except Exception:
+        is_success = False
+
+    if is_success:
+        io_buf = io.BytesIO(im_buf_arr)
+        num_result["num_img"] = io_buf.getvalue()
+        im_buf_arr = np.zeros(0)
+    else:
+        num_result["num_img"] = None
+
+    # tune output accuracy
+    if len(num_result["num_avto_str"]) < 6:
+        num_result["accuracy"] *= 0.3
+
+    return num_result
 
 
 ################################################################################
 
 if __name__ == "__main__":
-
     img_path = (
         Path(__file__)
         .resolve()
@@ -290,5 +334,6 @@ def get_num_avto(img_avto):
         print("Помилка завантаження зображення. Перевірте шлях до файлу.")
         exit(1)
 
-    result = get_num_avto(original)
-    print(f"ok - {result}")
+    # num_result = get_num_avto(original)
+    num_result = get_num_auto_png(original)
+    print(num_result)
diff --git a/FRONTEND/fastparking/finance/views.py b/FRONTEND/fastparking/finance/views.py
index d9a706db..ed109640 100644
--- a/FRONTEND/fastparking/finance/views.py
+++ b/FRONTEND/fastparking/finance/views.py
@@ -1,7 +1,9 @@
-
 from django.shortcuts import render
 
+
 def main(request):
+    active_menu = "finance"
     # ваш код для обробки запиту тут
-    return render(request, 'finance/main.html')  # або інша логіка відповідно до вашого проекту
-
+    return render(
+        request, "finance/main.html", {"active_menu": active_menu}
+    )  # або інша логіка відповідно до вашого проекту
diff --git a/FRONTEND/fastparking/parking/templates/parking/base.html b/FRONTEND/fastparking/parking/templates/parking/base.html
index c14bc420..2e623030 100644
--- a/FRONTEND/fastparking/parking/templates/parking/base.html
+++ b/FRONTEND/fastparking/parking/templates/parking/base.html
@@ -32,7 +32,7 @@ <h1 class="visually-hidden">Sidebars examples</h1>
     <hr>
     <ul class="nav nav-pills flex-column">
       <li>
-        <a class="nav-link active" href="/">
+        <a class="nav-link {% if active_menu == 'home' %}active{% else %}text-white{% endif %}" href="/">
           <i class="fa-solid fa-home"></i>
           <span class="nav-item mx-auto">Home</span>
         </a>
@@ -40,45 +40,45 @@ <h1 class="visually-hidden">Sidebars examples</h1>
       {% if user.is_authenticated %}
       <li><a href="/accounts/cabinet/">Profile</a></li>
       <li>
-        <a class="nav-link text-white" href="/cars/">
+        <a class="nav-link {% if active_menu == 'cars' %}active{% else %}text-white{% endif %}" href="/cars/">
           <i class="fa-solid fa-car"></i>
           <span class="nav-item">Cars</span>
         </a>
       </li>
       <li>
-        <a class="nav-link text-white" href="{% url 'finance:main' %}">
+        <a class="nav-link {% if active_menu == 'finance' %}active{% else %}text-white{% endif %}" href="{% url 'finance:main' %}">
           <i class="fa-solid fa-table-list"></i>
           <span class="nav-item">Finance</span>
         </a>
       </li>
       
       <li>
-        <a class="nav-link text-white" href="{% url 'communications:main' %}">
+        <a class="nav-link {% if active_menu == 'messages' %}active{% else %}text-white{% endif %}" href="{% url 'communications:main' %}">
           <i class="fa-solid fa-earth-americas"></i>
           <span class="nav-item">Messages</span>
         </a>
       </li>
       <li>
-        <a class="nav-link text-white" href="{% url 'photos:main' %}">
+        <a class="nav-link {% if active_menu == 'photos' %}active{% else %}text-white{% endif %}" href="{% url 'photos:main' %}">
           <i class="fa-solid fa-folders"></i>
           <span class="nav-item">Photos</span>
         </a>
       </li>
       <li>
-        <a class="nav-link text-white" href="{% url 'users:logout' %}">
+        <a class="nav-link {% if active_menu == 'logout' %}active{% else %}text-white{% endif %}" href="{% url 'users:logout' %}">
           <i class="fa-solid fa-sign-out"></i>
           <span class="nav-item">Logout</span>
         </a>
       </li>
       {% else %}
       <li>
-        <a class="nav-link text-white" href="{% url 'users:username' %}">
+        <a class="nav-link {% if active_menu == 'signin' %}active{% else %}text-white{% endif %}" href="{% url 'users:username' %}">
           <i class="fa-solid fa-user"></i>
           <span class="nav-item">SignIn</span>
         </a>
       </li>
       <li>
-        <a class="nav-link text-white" href="{% url 'users:register' %}">
+        <a class="nav-link {% if active_menu == 'signup' %}active{% else %}text-white{% endif %}" href="{% url 'users:register' %}">
           <i class="fa-solid fa-user-check"></i>
           <span class="nav-item">SignUp</span>
         </a>
diff --git a/FRONTEND/fastparking/parking/views.py b/FRONTEND/fastparking/parking/views.py
index 7da1a5db..8d047ec9 100644
--- a/FRONTEND/fastparking/parking/views.py
+++ b/FRONTEND/fastparking/parking/views.py
@@ -2,5 +2,11 @@
 
 # Create your views here.
 
+
 def main(request):
-    return render(request, 'parking/index.html', {"title": "Fast Parking"})
\ No newline at end of file
+    active_menu = "home"
+    return render(
+        request,
+        "parking/index.html",
+        {"title": "Fast Parking", "active_menu": active_menu},
+    )
diff --git a/FRONTEND/fastparking/photos/repository.py b/FRONTEND/fastparking/photos/repository.py
index 3d5a73fc..b31a6ab3 100644
--- a/FRONTEND/fastparking/photos/repository.py
+++ b/FRONTEND/fastparking/photos/repository.py
@@ -10,7 +10,11 @@
 TYPES = {"0": "IN", "1": "OUT"}
 
 
+<<<<<<< HEAD
 def save_prediction(predict: dict, type: str) -> None:
+=======
+def db_save_photo_information(predict: dict, type: str) -> int | None:
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
     num_auto = predict.get("num_avto_str")
     accuracy = predict.get("accuracy")
     num_img = predict.get("num_img")
@@ -21,6 +25,10 @@ def save_prediction(predict: dict, type: str) -> None:
         record.photo = num_img
         record.type = type
         record.save()
+<<<<<<< HEAD
+=======
+        return record.id
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
 
 
 def save_image(f, type: str = "", filepath: Path | None = None):
@@ -40,8 +48,18 @@ def save_image(f, type: str = "", filepath: Path | None = None):
                 destination.write(chunk)
 
 
+<<<<<<< HEAD
 def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
     if f and type:
+=======
+def registration_car(utc_datetime, registration_data):
+    print(f"registration_car: {utc_datetime=}, {registration_data=}")
+
+
+def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
+    if f and type:
+        utc_datetime = datetime.utcnow()
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
         info = f"File accepted, sizes: {len(f) // 1024} KB, {type=}"
         #  try to save
         # try:
@@ -52,7 +70,15 @@ def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
         # analyze and calculate prediction of image
         predict = get_num_auto_png_io(f.read())
         # store information to database
+<<<<<<< HEAD
         save_prediction(predict, type)
+=======
+        photo_id = db_save_photo_information(predict, type)
+        # registration
+        num_auto = predict.get("num_avto_str")
+        registration_data = {"photo_id": photo_id, "num_auto": num_auto, "type": type}
+        registration_car(utc_datetime, registration_data)
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
         # prepare for show on web page
         binary_image_data = predict.get("num_img")
         if binary_image_data:
diff --git a/FRONTEND/fastparking/photos/templates/photos/main.html b/FRONTEND/fastparking/photos/templates/photos/main.html
index c43dccbd..9bbf4735 100644
--- a/FRONTEND/fastparking/photos/templates/photos/main.html
+++ b/FRONTEND/fastparking/photos/templates/photos/main.html
@@ -1,6 +1,12 @@
 <!-- finance/templates/finance/main.html -->
 {% extends "parking/base.html" %}
 {% block content %}
+<<<<<<< HEAD
     <title>Title</title>
     <a href="upload">Upload</a>
+=======
+    <h2>
+        <a href="upload">Завантажити фото транспортного засобу</a>
+    </h2>
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
 {% endblock content %}
\ No newline at end of file
diff --git a/FRONTEND/fastparking/photos/views.py b/FRONTEND/fastparking/photos/views.py
index 91b98328..3ac397c1 100644
--- a/FRONTEND/fastparking/photos/views.py
+++ b/FRONTEND/fastparking/photos/views.py
@@ -33,7 +33,13 @@ def upload_file(request):
 
 
 def main(request):
+    active_menu = "photos"
     # ваш код для обробки запиту тут
     return render(
+<<<<<<< HEAD
         request, "photos/main.html"
-    )  # або інша логіка відповідно до вашого проекту
\ No newline at end of file
+    )  # або інша логіка відповідно до вашого проекту
+=======
+        request, "photos/main.html", {"active_menu": active_menu}
+    )  # або інша логіка відповідно до вашого проекту
+>>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
diff --git a/FRONTEND/fastparking/utils/get_news.py b/FRONTEND/fastparking/utils/get_news.py
index d99e28d4..962dd18e 100644
--- a/FRONTEND/fastparking/utils/get_news.py
+++ b/FRONTEND/fastparking/utils/get_news.py
@@ -1,56 +1,10 @@
-from pathlib import Path
-from utils.telegram_api import send_message_news
+import os
+import django
 
+# Set up Django environment
+os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fastparking.settings")
+django.setup()
 
-STORE_FILE = Path(__file__).resolve().parent.joinpath("news.txt")
-TELEGRAM_CHANEL_FILE = 'telegram_channel.txt'
+from communications.send_news import send_news_to_telegram
 
-
-def read_store():
-    store = []
-    if STORE_FILE.exists():
-        with STORE_FILE.open("r") as text:
-            block = []
-            for line in text:
-                line = line.strip()
-                if line == "@@@@@":
-                    store.append(block)
-                    block = []
-                    continue
-                block.append(line)
-            if block:
-                store.append(block)
-    return store
-
-
-def get_latest_block():
-    store = read_store()
-    if store:
-        return "\n".join(store[-1])
-    else:
-        return "Новин немає"
-
-
-def read_telegram_chanel():
-    if Path(TELEGRAM_CHANEL_FILE).exists():
-        with open(TELEGRAM_CHANEL_FILE, "r") as file:
-            return file.read().strip()
-    return None
-
-
-def write_telegram_chanel(content):
-    with open(TELEGRAM_CHANEL_FILE, "w") as file:
-        file.write(content)
-
-
-def publish_latest_news():
-    latest_news = get_latest_block()
-    last_published_news = read_telegram_chanel()
-
-    if latest_news != last_published_news:
-        write_telegram_chanel(latest_news)
-        send_message_news(latest_news)
-
-
-if __name__ == "__main__":
-    publish_latest_news()
+send_news_to_telegram()
diff --git a/FRONTEND/fastparking/utils/news.txt b/FRONTEND/fastparking/utils/news.txt
deleted file mode 100644
index 7f85b65a..00000000
--- a/FRONTEND/fastparking/utils/news.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-Очікуйте на відкриття нащої парковки 18.04.2024 о 19:30
-@@@@@
\ No newline at end of file
diff --git a/FRONTEND/fastparking/utils/sheduler.py b/FRONTEND/fastparking/utils/sheduler.py
index a194fbcf..ee9d34b8 100644
--- a/FRONTEND/fastparking/utils/sheduler.py
+++ b/FRONTEND/fastparking/utils/sheduler.py
@@ -3,6 +3,7 @@
 
 
 from telegram_api import crone_pool, send_message_news
+from communications.send_news import send_news_to_telegram
 
 
 def handler_telegram_pool(print_log: bool = False):
@@ -19,6 +20,7 @@ def handler_limit_check(print_log: bool = False):
 def handler_news_check(print_log: bool = False):
     if print_log:
         print("- handler_news_check")
+    send_news_to_telegram()
     # send_message_news(
     #     "Simulation news sending, every 15 mins since start app: <datetime>"
     # )
@@ -51,12 +53,23 @@ def handler_news_check(print_log: bool = False):
         default=60 * 15,
         help="Limit Check period in seconds, default 900 sec (15 mins)",
     )
+    parser.add_argument(
+        "--sent_hello",
+        action="store_true",
+        help="hello message on boot",
+    )
     parser.add_argument("-q", "--quite", action="store_true", help="Quite")
     args = parser.parse_args()
 
-    send_message_news(
-        "Hosting server just applied new changes of git branch at: <datetime>"
-    )
+    if args.sent_hello:
+        if __name__ == "__main__":
+            text = "Local developer run 'sheduler.py' at: <datetime>"
+        else:
+            text = (
+                "Hosting server just applied new changes of git branch at: <datetime>"
+            )
+        result = send_message_news(text)
+    # print(f"{result=}")
     if args.loop:
         loop_delay = args.delay
         time_now = time.time()
diff --git a/FRONTEND/fastparking/utils/telegram_api.py b/FRONTEND/fastparking/utils/telegram_api.py
index bff75f19..fa37b690 100644
--- a/FRONTEND/fastparking/utils/telegram_api.py
+++ b/FRONTEND/fastparking/utils/telegram_api.py
@@ -13,7 +13,11 @@
 from django.conf import settings
 from django.core.cache import cache
 
-from get_anekdot import get_random_block
+try:
+    from get_anekdot import get_random_block
+except ImportError:
+    from .get_anekdot import get_random_block
+
 
 # import settings from Django
 os.environ.setdefault("DJANGO_SETTINGS_MODULE", "fastparking.settings")
@@ -148,7 +152,8 @@ def send_message(text: str, chat_id: int | str, parse_mode: bool = False) -> Non
         }
     else:
         json = {"chat_id": chat_id, "text": text}
-    _ = requests.post(url, json=json, timeout=10)
+    response = requests.post(url, json=json, timeout=10)
+    return response.status_code == 200
     # print(_)
 
 
@@ -161,30 +166,34 @@ def send_button_message(text: str, chat_id: int | str, reply_markup: dict) -> No
         "reply_markup": reply_markup,
         "link_preview_options": {"is_disabled": True},
     }
-    _ = requests.post(url, json=json, timeout=10)
+    response = requests.post(url, json=json, timeout=10)
+    return response.status_code == 200
     # print(_)
 
 
-def send_message_user(text: str, n_name: str) -> None:
+def send_message_user(text: str, n_name: str) -> bool | None:
     updates = get_updates()
     if not updates:
         return
     chat_id = user_id_by_username(updates, n_name)
     if chat_id:
-        send_message(text=text, chat_id=chat_id)
+        return send_message(text=text, chat_id=chat_id)
 
 
-def send_message_news(text: str, chat_id: int | str = TELEGRAM_NEWS_NAME) -> None:
+def send_message_news(
+    text: str, chat_id: int | str = TELEGRAM_NEWS_NAME
+) -> bool | None:
     if chat_id:
         if text.find("<") != -1 and text.find(">") != -1:
             text = parse_text(text)
         # print(f"send_message_news: {chat_id=}, {text=}")
-        send_message(text=text, chat_id=chat_id)
+        return send_message(text=text, chat_id=chat_id)
 
 
-def answer_to_user(user_id: str | int, text: str, parse_mode: bool = False):
-    print(f"answer_to_user: {user_id=} {text=}")
-    send_message(text, user_id, parse_mode=parse_mode)
+def answer_to_user(user_id: str | int, text: str, parse_mode: bool = False, debug=True):
+    if debug:
+        print(f"answer_to_user: {user_id=} {text=}")
+    return send_message(text, user_id, parse_mode=parse_mode)
 
 
 def get_local_time_now() -> datetime:
@@ -346,7 +355,7 @@ def parse_commands(updates: list[dict]) -> None:
                     return
 
 
-def send_qrcode(chat_id: int | str, qr_data: str = "FastParking") -> None:
+def send_qrcode(chat_id: int | str, qr_data: str = "FastParking") -> bool | None:
     img = qrcode.make(qr_data, border=2)
     mem_file = BytesIO()
     img.save(mem_file)
@@ -355,10 +364,11 @@ def send_qrcode(chat_id: int | str, qr_data: str = "FastParking") -> None:
     data = {"chat_id": chat_id}
     url = f"{BASE_URL}/sendPhoto"
 
-    _ = requests.post(url, data=data, files={"photo": mem_file})
+    response = requests.post(url, data=data, files={"photo": mem_file})
+    return response.status_code == 200
 
 
-def handler_with_button(user_id: str, username: str | None = None):
+def handler_with_button(user_id: str, username: str | None = None) -> bool | None:
     print_text = [parse_text("TEST <datetime>")]
     reply_markup = {"inline_keyboard": []}
     inlineRow = [
@@ -367,7 +377,7 @@ def handler_with_button(user_id: str, username: str | None = None):
         {"text": "News", "url": "https://t.me/fastparking_news"},
     ]
     reply_markup["inline_keyboard"].append(inlineRow)
-    send_button_message("\n".join(print_text), user_id, reply_markup)
+    return send_button_message("\n".join(print_text), user_id, reply_markup)
 
 
 def handler_start(user_id: str, username: str | None = None):
@@ -549,7 +559,6 @@ def crone_pool():
         list_id = get_updated_id(updates)
         if list_id:
             save_latest_update_id(list_id[-1])
-            # save_unknown_users(updates)
             parse_commands(updates)
 
 
diff --git a/FRONTEND/fastparking/utils/telegram_chanel.txt b/FRONTEND/fastparking/utils/telegram_chanel.txt
deleted file mode 100644
index e69de29b..00000000
diff --git a/scripts/cron_loop.sh b/scripts/cron_loop.sh
index 6c38376c..cbabdd3c 100755
--- a/scripts/cron_loop.sh
+++ b/scripts/cron_loop.sh
@@ -1,6 +1,6 @@
 #!/bin/bash
 
 while true; do
-  /Users/lex/Library/Caches/pypoetry/virtualenvs/fastparking-AxfRhjiv-py3.11/bin/python3.11 /Users/lex/PycharmProjects/PlateN/FRONTEND/fastparking/utils/telegram_api.py
+  python ../fastparking/utils/telegram_api.py
   sleep 2
 done
diff --git a/scripts/make_migrate_dev_app.sh b/scripts/make_migrate_dev_app.sh
old mode 100644
new mode 100755

From e20cc2128835e93c3671c8dbbb2a535f3e959545 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 08:36:59 +0300
Subject: [PATCH 03/19] test

---
 FRONTEND/fastparking/cron_loop.cmd | 2 +-
 FRONTEND/fastparking/cron_loop.sh  | 2 +-
 FRONTEND/pyproject.toml            | 1 +
 3 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/FRONTEND/fastparking/cron_loop.cmd b/FRONTEND/fastparking/cron_loop.cmd
index 05eb50cd..e0c2ad40 100644
--- a/FRONTEND/fastparking/cron_loop.cmd
+++ b/FRONTEND/fastparking/cron_loop.cmd
@@ -1 +1 @@
-python utils\sheduler.py --loop -q
\ No newline at end of file
+python utils\sheduler.py --loop -q --sent_hello
\ No newline at end of file
diff --git a/FRONTEND/fastparking/cron_loop.sh b/FRONTEND/fastparking/cron_loop.sh
index 13b66959..c6231d7c 100755
--- a/FRONTEND/fastparking/cron_loop.sh
+++ b/FRONTEND/fastparking/cron_loop.sh
@@ -1,6 +1,6 @@
 #!/bin/env sh
 
-python ./utils/sheduler.py --loop -q
+python ./utils/sheduler.py --loop -q --sent_hello
 
 # while true; do
 #   python ./utils/telegram_api.py
diff --git a/FRONTEND/pyproject.toml b/FRONTEND/pyproject.toml
index e3f5696c..3a4a52c6 100644
--- a/FRONTEND/pyproject.toml
+++ b/FRONTEND/pyproject.toml
@@ -26,6 +26,7 @@ django-tables2 = "^2.7.0"
 
 [tool.poetry.group.dev.dependencies]
 scikit-learn = "^1.4.2"
+# opencv-python = "^4.9.0.80"
 
 [build-system]
 requires = ["poetry-core"]

From cd1512439abee9a48eb58d47bbbbb0a996eec2a3 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 08:43:51 +0300
Subject: [PATCH 04/19] test

---
 FRONTEND/fastparking/photos/templates/photos/main.html | 6 +-----
 1 file changed, 1 insertion(+), 5 deletions(-)

diff --git a/FRONTEND/fastparking/photos/templates/photos/main.html b/FRONTEND/fastparking/photos/templates/photos/main.html
index 9bbf4735..58c9c500 100644
--- a/FRONTEND/fastparking/photos/templates/photos/main.html
+++ b/FRONTEND/fastparking/photos/templates/photos/main.html
@@ -1,12 +1,8 @@
 <!-- finance/templates/finance/main.html -->
 {% extends "parking/base.html" %}
 {% block content %}
-<<<<<<< HEAD
-    <title>Title</title>
-    <a href="upload">Upload</a>
-=======
     <h2>
         <a href="upload">Завантажити фото транспортного засобу</a>
     </h2>
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
+
 {% endblock content %}
\ No newline at end of file

From cb31b576287a411e23210f16262ba2816b3e3cc4 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 09:51:30 +0300
Subject: [PATCH 05/19] test

---
 FRONTEND/fastparking/finance/models.py    |  5 +++--
 FRONTEND/fastparking/parking/models.py    | 17 ++++++-----------
 FRONTEND/fastparking/photos/models.py     |  1 -
 FRONTEND/fastparking/photos/repository.py | 16 ----------------
 FRONTEND/fastparking/photos/views.py      |  5 -----
 FRONTEND/fastparking/users/models.py      |  4 ++--
 6 files changed, 11 insertions(+), 37 deletions(-)

diff --git a/FRONTEND/fastparking/finance/models.py b/FRONTEND/fastparking/finance/models.py
index 2edca61a..1e3cf0a2 100644
--- a/FRONTEND/fastparking/finance/models.py
+++ b/FRONTEND/fastparking/finance/models.py
@@ -1,4 +1,5 @@
 from django.db import models
+from parking.models import Registration
 
 class Tariff(models.Model):
     description = models.CharField(max_length=255)
@@ -11,8 +12,8 @@ def __str__(self):
         return self.description
 
 class Payment(models.Model):
-    user_id = models.IntegerField(blank=True, null=True)  # ID користувача, який здійснив оплату (не обов'язкове)
-    registration_id = models.IntegerField()  # ID реєстрації, за яку здійснюється оплата
+    # user_id = models.IntegerField(blank=True, null=True)  # ID користувача, який здійснив оплату (не обов'язкове)
+    registration_id = models.ForeignKey(Registration, on_delete=models.SET_NULL, null=True, blank=True)  # ID реєстрації, за яку здійснюється оплата
     amount = models.DecimalField(max_digits=10, decimal_places=2)
     datetime = models.DateTimeField()
 
diff --git a/FRONTEND/fastparking/parking/models.py b/FRONTEND/fastparking/parking/models.py
index b7266964..0d963cf3 100644
--- a/FRONTEND/fastparking/parking/models.py
+++ b/FRONTEND/fastparking/parking/models.py
@@ -1,32 +1,27 @@
 from django.db import models
-from cars.models import Car
-from finance.models import Tariff
-from finance.models import Payment
-from users.models import CustomUser
 from photos.models import Photo
 
 
+
 class ParkingSpace(models.Model):
     number = models.CharField(max_length=10, unique=True)
     status = models.BooleanField(default=False)  # False - вільно, True - зайнято
-    user = models.ForeignKey(CustomUser, on_delete=models.SET_NULL, null=True, blank=True)
+    registration_id = models.ForeignKey(Photo, on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return self.number
+
 class Registration(models.Model):
     parking = models.ForeignKey(ParkingSpace, on_delete=models.CASCADE)
     entry_datetime = models.DateTimeField(auto_now_add=True)
     car_number_in = models.CharField(max_length=16)
-    tariff = models.ForeignKey(Tariff, on_delete=models.SET_NULL, null=True)
     exit_datetime = models.DateTimeField(null=True, blank=True)
     invoice = models.CharField(max_length=255, null=True, blank=True)
-    payment = models.ForeignKey(Payment, on_delete=models.SET_NULL, null=True, blank=True)
     car_number_out = models.CharField(max_length=16, null=True, blank=True)
-    photo_in = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name=type, null=True, blank=True)
-    photo_out = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name=type, null=True, blank=True)
-    car = models.ForeignKey(Car, on_delete=models.SET_NULL, null=True, blank=True)
+    photo_in = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='type.Photo', null=True, blank=True)
+    photo_out = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='type.Photo', null=True, blank=True)
+    car = models.ForeignKey(Photo, on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return f"Registration ID: {self.id} - Parking ID: {self.parking_id} - Entry Time: {self.entry_datetime}"
 
-
diff --git a/FRONTEND/fastparking/photos/models.py b/FRONTEND/fastparking/photos/models.py
index 05e04f8e..795101f5 100644
--- a/FRONTEND/fastparking/photos/models.py
+++ b/FRONTEND/fastparking/photos/models.py
@@ -1,6 +1,5 @@
 from django.db import models
 from django.conf import settings
-from users.models import CustomUser
 
 
 class Photo(models.Model):
diff --git a/FRONTEND/fastparking/photos/repository.py b/FRONTEND/fastparking/photos/repository.py
index b31a6ab3..92ba81cd 100644
--- a/FRONTEND/fastparking/photos/repository.py
+++ b/FRONTEND/fastparking/photos/repository.py
@@ -10,11 +10,7 @@
 TYPES = {"0": "IN", "1": "OUT"}
 
 
-<<<<<<< HEAD
-def save_prediction(predict: dict, type: str) -> None:
-=======
 def db_save_photo_information(predict: dict, type: str) -> int | None:
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
     num_auto = predict.get("num_avto_str")
     accuracy = predict.get("accuracy")
     num_img = predict.get("num_img")
@@ -25,10 +21,7 @@ def db_save_photo_information(predict: dict, type: str) -> int | None:
         record.photo = num_img
         record.type = type
         record.save()
-<<<<<<< HEAD
-=======
         return record.id
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
 
 
 def save_image(f, type: str = "", filepath: Path | None = None):
@@ -48,10 +41,6 @@ def save_image(f, type: str = "", filepath: Path | None = None):
                 destination.write(chunk)
 
 
-<<<<<<< HEAD
-def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
-    if f and type:
-=======
 def registration_car(utc_datetime, registration_data):
     print(f"registration_car: {utc_datetime=}, {registration_data=}")
 
@@ -59,7 +48,6 @@ def registration_car(utc_datetime, registration_data):
 def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
     if f and type:
         utc_datetime = datetime.utcnow()
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
         info = f"File accepted, sizes: {len(f) // 1024} KB, {type=}"
         #  try to save
         # try:
@@ -70,15 +58,11 @@ def handle_uploaded_file(f, type: str | None) -> dict[str, dict]:
         # analyze and calculate prediction of image
         predict = get_num_auto_png_io(f.read())
         # store information to database
-<<<<<<< HEAD
-        save_prediction(predict, type)
-=======
         photo_id = db_save_photo_information(predict, type)
         # registration
         num_auto = predict.get("num_avto_str")
         registration_data = {"photo_id": photo_id, "num_auto": num_auto, "type": type}
         registration_car(utc_datetime, registration_data)
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
         # prepare for show on web page
         binary_image_data = predict.get("num_img")
         if binary_image_data:
diff --git a/FRONTEND/fastparking/photos/views.py b/FRONTEND/fastparking/photos/views.py
index 3ac397c1..2be1c692 100644
--- a/FRONTEND/fastparking/photos/views.py
+++ b/FRONTEND/fastparking/photos/views.py
@@ -36,10 +36,5 @@ def main(request):
     active_menu = "photos"
     # ваш код для обробки запиту тут
     return render(
-<<<<<<< HEAD
-        request, "photos/main.html"
-    )  # або інша логіка відповідно до вашого проекту
-=======
         request, "photos/main.html", {"active_menu": active_menu}
     )  # або інша логіка відповідно до вашого проекту
->>>>>>> 24a318c026ab56ee1be90672976362ed52bc0463
diff --git a/FRONTEND/fastparking/users/models.py b/FRONTEND/fastparking/users/models.py
index 71e940f9..2aa6ae2c 100644
--- a/FRONTEND/fastparking/users/models.py
+++ b/FRONTEND/fastparking/users/models.py
@@ -6,10 +6,10 @@
 
 
 class CustomUser(AbstractUser):
-    cars = models.TextField(blank=True, null=True)
+    # cars = models.TextField(blank=True, null=True)
     telegram_nickname = models.CharField(max_length=20, blank=True, null=True)
     phone_number = models.CharField(max_length=20, blank=True, null=True)
     telegram_id = models.CharField(max_length=50, blank=True, null=True)
-    # cars = models.ManyToManyField(Car, related_name='owners', blank=True)  # Додано поле багато-до-багатьох для прив'язки автомобілів до користувача
+    cars = models.ManyToManyField(Car, related_name='owners', blank=True)  # Додано поле багато-до-багатьох для прив'язки автомобілів до користувача
     def __str__(self):
         return self.username
\ No newline at end of file

From 44a6905e22b08fe3198456a42c7d47876a3b39e3 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 12:30:10 +0300
Subject: [PATCH 06/19] add tariff

---
 .../accounts/templates/accounts/add_car.html  | 29 ++++++++++++
 .../accounts/templates/accounts/delete.html   | 24 ++++++++++
 .../accounts/templates/accounts/edit_car.html | 37 +++++++++++++++
 .../accounts/templates/accounts/my_cars.html  | 47 +++++++++++++++++++
 .../accounts/templates/accounts/profile.html  | 33 +++++--------
 .../accounts/templates/accounts/profile1.html | 24 ++++++++++
 FRONTEND/fastparking/finance/admin.py         | 45 +++++++-----------
 FRONTEND/fastparking/finance/forms.py         |  7 +++
 ...t_user_id_alter_payment_registration_id.py | 24 ++++++++++
 .../finance/templates/finance/add_tariff.html | 16 +++++++
 .../finance/templates/finance/main.html       | 14 +++---
 .../finance/templates/finance/tariff.html     |  0
 FRONTEND/fastparking/finance/urls.py          |  3 ++
 FRONTEND/fastparking/finance/views.py         | 25 +++++++++-
 ...er_remove_registration_payment_and_more.py | 42 +++++++++++++++++
 FRONTEND/fastparking/parking/models.py        | 12 +++--
 ..._remove_customuser_cars_customuser_cars.py | 23 +++++++++
 Untitled-1.py                                 |  7 +++
 18 files changed, 352 insertions(+), 60 deletions(-)
 create mode 100644 FRONTEND/fastparking/accounts/templates/accounts/add_car.html
 create mode 100644 FRONTEND/fastparking/accounts/templates/accounts/delete.html
 create mode 100644 FRONTEND/fastparking/accounts/templates/accounts/edit_car.html
 create mode 100644 FRONTEND/fastparking/accounts/templates/accounts/my_cars.html
 create mode 100644 FRONTEND/fastparking/accounts/templates/accounts/profile1.html
 create mode 100644 FRONTEND/fastparking/finance/forms.py
 create mode 100644 FRONTEND/fastparking/finance/migrations/0002_remove_payment_user_id_alter_payment_registration_id.py
 create mode 100644 FRONTEND/fastparking/finance/templates/finance/add_tariff.html
 delete mode 100644 FRONTEND/fastparking/finance/templates/finance/tariff.html
 create mode 100644 FRONTEND/fastparking/parking/migrations/0002_remove_parkingspace_user_remove_registration_payment_and_more.py
 create mode 100644 FRONTEND/fastparking/users/migrations/0003_remove_customuser_cars_customuser_cars.py
 create mode 100644 Untitled-1.py

diff --git a/FRONTEND/fastparking/accounts/templates/accounts/add_car.html b/FRONTEND/fastparking/accounts/templates/accounts/add_car.html
new file mode 100644
index 00000000..ddeb1369
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/templates/accounts/add_car.html
@@ -0,0 +1,29 @@
+{% extends "parking/base.html" %}
+{% block content %}
+
+<form method="post" action="{% url 'accounts:add_car' %}"></form>
+    <title>{{ title }}</title>
+</head>
+<body>
+    <h1>{{ title }}</h1>
+    <form action="{% url 'accounts:add_car' %}" method="post">
+        {% csrf_token %}
+        {{ my_cars_form.as_p }}
+        {{ car_number_form.as_p }}
+        <button type="submit" class="btn btn-primary">Add Car</button>
+    </form>
+</body>
+</html>
+<!-- <title>{{ title }}</title>
+</head>
+<body>
+    <h1>{{ title }}</h1>
+    <form method="post">
+        {% csrf_token %}
+        {{ my_cars_form.as_p }}
+        <button type="submit">Add Car</button>
+    </form>
+</body>
+</html> -->
+
+{% endblock content %}
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/delete.html b/FRONTEND/fastparking/accounts/templates/accounts/delete.html
new file mode 100644
index 00000000..38ffc7de
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/templates/accounts/delete.html
@@ -0,0 +1,24 @@
+{% extends "parking/base.html" %}
+
+{% block content %}
+
+<h1>{{ title }}</h1>
+
+<p>Are you sure you want to delete the car:</p>
+
+<ul>
+  <li>Brand: {{ my_cars.brand }}</li>
+  <li>Type: {{ my_cars.car_type }}</li>
+  <li>Car number: {{ car_number.car_number }}</li>
+</ul>
+
+<form method="post" action="{% url 'accounts:delete' pk=my_cars.pk %}">
+  {% csrf_token %}
+  <button type="submit" class="btn btn-danger">Yes, delete car</button>
+  <a href="{% url 'accounts:my_cars' %}" class="btn btn-secondary">Cancel</a>
+</form>
+
+{% endblock content %}
+
+
+
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/edit_car.html b/FRONTEND/fastparking/accounts/templates/accounts/edit_car.html
new file mode 100644
index 00000000..ddf84d16
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/templates/accounts/edit_car.html
@@ -0,0 +1,37 @@
+{% extends "parking/base.html" %}
+
+{% block content %}
+
+<h1>{{ title }}</h1>
+
+<form method="post">
+  {% csrf_token %}
+
+  <div class="form-group">
+    <label for="id_brand">Brand:</label>
+    {{ my_cars_form.brand }}
+    {% for error in my_cars_form.brand.errors %}
+      <p style="color: red;">{{ error }}</p>
+    {% endfor %}
+  </div>
+
+  <div class="form-group">
+    <label for="id_car_type">Car type:</label>
+    {{ my_cars_form.car_type }}
+    {% for error in my_cars_form.car_type.errors %}
+      <p style="color: red;">{{ error }}</p>
+    {% endfor %}
+  </div>
+
+  <div class="form-group">
+    <label for="id_car_number">Car number:</label>
+    {{ car_number_form.car_number }}
+    {% for error in car_number_form.car_number.errors %}
+      <p style="color: red;">{{ error }}</p>
+    {% endfor %}
+  </div>
+
+  <button type="submit" class="btn btn-primary">Save Changes</button>
+</form>
+
+{% endblock content %}
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/my_cars.html b/FRONTEND/fastparking/accounts/templates/accounts/my_cars.html
new file mode 100644
index 00000000..4c8c861b
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/templates/accounts/my_cars.html
@@ -0,0 +1,47 @@
+{% extends "parking/base.html" %}
+{% block content %}
+
+
+    <title>{{ title }}</title>
+</head>
+<body>
+    <h1>{{ title }}</h1>
+    {% if my_cars %}
+        <ul>
+            {% for car in my_cars %}
+            
+            
+            <li>Brand: {{ car.brand }}</li>
+            <li>Type: {{ car.car_type }}</li>
+            <li>Number: {{ car.car_number }}</li>
+            <a href="{% url 'accounts:edit_car' car.pk %}" class="btn btn-primary">Edit</a>
+            <a href="{% url 'accounts:delete' car.pk %}" class="btn btn-primary">Delete Car</a>
+
+           
+            
+            {% endfor %}
+        </ul>
+    {% else %}
+        <p>No cars found.</p>
+    {% endif %}
+    
+    
+
+    <div class="card-body" style="display: inline-block">
+        
+        
+        <a href="{% url 'accounts:add_car' %}" class="btn btn-success">Add new Car</a>
+
+        
+
+        
+
+        
+
+    </div>
+</div>
+
+</body>
+</html>
+{% endblock content %}
+
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/profile.html b/FRONTEND/fastparking/accounts/templates/accounts/profile.html
index d2f922b6..de037bdc 100644
--- a/FRONTEND/fastparking/accounts/templates/accounts/profile.html
+++ b/FRONTEND/fastparking/accounts/templates/accounts/profile.html
@@ -1,24 +1,15 @@
-<!-- profile.html -->
-{% extends "base.html" %}
-
+{% extends "parking/base.html" %}
 {% block content %}
-<div class="container">
-    <h1>Welcome to your profile</h1>
 
-    <!-- Display user's cars -->
-    <h2>Your Cars</h2>
-    <ul>
-        {% for car in user_cars %}
-            <li>{{ car.car_number }}</li>
-        {% endfor %}
-    </ul>
+    <title>User Profile</title>
+</head>
+<body>
+    <h1>User Profile</h1>
+    <p>Username: {{ request.user.username }}</p>
+    <p>Email: {{ request.user.email }}</p>
+    <!-- Додайте інші дані профілю користувача, які вам потрібні -->
 
-    <!-- Form to add a new car -->
-    <h2>Add a New Car</h2>
-    <form method="post" enctype="multipart/form-data">
-        {% csrf_token %}
-        {{ form.as_p }}
-        <button type="submit">Add Car</button>
-    </form>
-</div>
-{% endblock %}
+    <a href="{% url 'accounts:my_cars' %}" class="btn btn-primary">My Cars</a>
+</body>
+</html> 
+{% endblock content %}
diff --git a/FRONTEND/fastparking/accounts/templates/accounts/profile1.html b/FRONTEND/fastparking/accounts/templates/accounts/profile1.html
new file mode 100644
index 00000000..d2f922b6
--- /dev/null
+++ b/FRONTEND/fastparking/accounts/templates/accounts/profile1.html
@@ -0,0 +1,24 @@
+<!-- profile.html -->
+{% extends "base.html" %}
+
+{% block content %}
+<div class="container">
+    <h1>Welcome to your profile</h1>
+
+    <!-- Display user's cars -->
+    <h2>Your Cars</h2>
+    <ul>
+        {% for car in user_cars %}
+            <li>{{ car.car_number }}</li>
+        {% endfor %}
+    </ul>
+
+    <!-- Form to add a new car -->
+    <h2>Add a New Car</h2>
+    <form method="post" enctype="multipart/form-data">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Add Car</button>
+    </form>
+</div>
+{% endblock %}
diff --git a/FRONTEND/fastparking/finance/admin.py b/FRONTEND/fastparking/finance/admin.py
index 15538594..fff5a875 100644
--- a/FRONTEND/fastparking/finance/admin.py
+++ b/FRONTEND/fastparking/finance/admin.py
@@ -3,34 +3,25 @@
 from .models import Tariff
 from .models import Payment
 
-admin.site.register(Tariff)
-admin.site.register(Payment)
-# from django.contrib import admin
-# from .models import Tariff, Payment
-
+# admin.site.register(Tariff)
+# admin.site.register(Payment)
 # class TariffAdmin(admin.ModelAdmin):
 #     list_display = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
-#     readonly_fields = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
-
-# class PaymentAdmin(admin.ModelAdmin):
-#     list_display = ['user', 'event_id', 'amount', 'datetime']
-#     readonly_fields = ['user', 'event_id', 'amount', 'datetime']
-
-# admin.site.register(Tariff, TariffAdmin)
-# admin.site.register(Payment, PaymentAdmin)
-# from django.contrib import admin
-# from .models import Payment
-# from users.models import CustomUser  # Припущення: така структура вашої моделі користувача
+#     list_filter = ['start_date', 'end_date']
+#     search_fields = ['description']
 
 # class PaymentAdmin(admin.ModelAdmin):
-#     list_display = ['get_username', 'event_id', 'amount', 'datetime']
-#     readonly_fields = ['user', 'event_id', 'amount', 'datetime']
-
-#     def get_username(self, obj):
-#         if obj.user:
-#             return obj.user.username
-#         return None
-
-#     get_username.short_description = 'Username'
-
-# admin.site.register(Payment, PaymentAdmin)
+#     list_display = ['user', 'amount', 'date']
+#     list_filter = ['date']
+#     search_fields = ['user__username']
+class TariffAdmin(admin.ModelAdmin):
+    list_display = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
+    list_filter = ['start_date', 'end_date']
+    search_fields = ['description']
+class PaymentAdmin(admin.ModelAdmin):
+    list_display = ['registration_id', 'amount', 'datetime']
+    list_filter = ['datetime']
+    search_fields = ['registration_id__description']  # Припущення: Якщо `description` - поле моделі Registration
+
+admin.site.register(Tariff, TariffAdmin)
+admin.site.register(Payment, PaymentAdmin)
\ No newline at end of file
diff --git a/FRONTEND/fastparking/finance/forms.py b/FRONTEND/fastparking/finance/forms.py
new file mode 100644
index 00000000..1f65755e
--- /dev/null
+++ b/FRONTEND/fastparking/finance/forms.py
@@ -0,0 +1,7 @@
+from django import forms
+from .models import Tariff
+
+class TariffForm(forms.ModelForm):
+    class Meta:
+        model = Tariff
+        fields = ['description', 'price_per_hour', 'price_per_day', 'start_date', 'end_date']
diff --git a/FRONTEND/fastparking/finance/migrations/0002_remove_payment_user_id_alter_payment_registration_id.py b/FRONTEND/fastparking/finance/migrations/0002_remove_payment_user_id_alter_payment_registration_id.py
new file mode 100644
index 00000000..ffc7c026
--- /dev/null
+++ b/FRONTEND/fastparking/finance/migrations/0002_remove_payment_user_id_alter_payment_registration_id.py
@@ -0,0 +1,24 @@
+# Generated by Django 5.0.4 on 2024-04-14 08:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('finance', '0001_initial'),
+        ('parking', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='payment',
+            name='user_id',
+        ),
+        migrations.AlterField(
+            model_name='payment',
+            name='registration_id',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='parking.registration'),
+        ),
+    ]
diff --git a/FRONTEND/fastparking/finance/templates/finance/add_tariff.html b/FRONTEND/fastparking/finance/templates/finance/add_tariff.html
new file mode 100644
index 00000000..c3b87a87
--- /dev/null
+++ b/FRONTEND/fastparking/finance/templates/finance/add_tariff.html
@@ -0,0 +1,16 @@
+<!-- У вашому файлі add_tariff.html -->
+<!DOCTYPE html>
+<html lang="en">
+<head>
+    <!-- Мета теги, посилання на стилі, скрипти та інше -->
+    <title>Add Tariff</title>
+</head>
+<body>
+    <h2>Add Tariff</h2>
+    <form method="post">
+        {% csrf_token %}
+        {{ form.as_p }}
+        <button type="submit">Save</button>
+    </form>
+</body>
+</html>
diff --git a/FRONTEND/fastparking/finance/templates/finance/main.html b/FRONTEND/fastparking/finance/templates/finance/main.html
index c4a33518..94a7cb5e 100644
--- a/FRONTEND/fastparking/finance/templates/finance/main.html
+++ b/FRONTEND/fastparking/finance/templates/finance/main.html
@@ -1,14 +1,16 @@
 <!-- finance/templates/finance/main.html -->
-{% extends "parking/base.html" %}
+
+<!-- У вашому файлі finance/main.html -->
 <!DOCTYPE html>
 <html lang="en">
 <head>
-    <meta charset="UTF-8">
-    <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>Main Page - Finance</title>
+    <!-- Мета теги, посилання на стилі, скрипти та інше -->
+    <title>Main Page</title>
 </head>
 <body>
-    <h1>Main Page - Finance</h1>
-    <p>This is a placeholder for the main page of the finance app.</p>
+    <h2>Main Page</h2>
+    <!-- Додайте посилання на сторінку додавання тарифу -->
+    <a href="{% url 'finance:add_tariff' %}">Add Tariff</a>
+    <!-- Інші елементи сторінки, такі як таблиці, графіки тощо -->
 </body>
 </html>
diff --git a/FRONTEND/fastparking/finance/templates/finance/tariff.html b/FRONTEND/fastparking/finance/templates/finance/tariff.html
deleted file mode 100644
index e69de29b..00000000
diff --git a/FRONTEND/fastparking/finance/urls.py b/FRONTEND/fastparking/finance/urls.py
index 1e2c93ad..b7210a0f 100644
--- a/FRONTEND/fastparking/finance/urls.py
+++ b/FRONTEND/fastparking/finance/urls.py
@@ -2,10 +2,13 @@
 
 from django.urls import path
 from . import views
+from .views import create_tariff
 
 app_name = 'finance'
 
 urlpatterns = [
     path('', views.main, name='main'),
+    # path('tariff/', create_tariff, name='create_tariff'),
+    path('add_tariff/', views.add_tariff, name='add_tariff'),
     # Інші URL-шляхи для вашого додатку "finance"
 ]
diff --git a/FRONTEND/fastparking/finance/views.py b/FRONTEND/fastparking/finance/views.py
index ed109640..32717c48 100644
--- a/FRONTEND/fastparking/finance/views.py
+++ b/FRONTEND/fastparking/finance/views.py
@@ -1,5 +1,6 @@
-from django.shortcuts import render
 
+from django.shortcuts import render, redirect
+from .forms import TariffForm
 
 def main(request):
     active_menu = "finance"
@@ -7,3 +8,25 @@ def main(request):
     return render(
         request, "finance/main.html", {"active_menu": active_menu}
     )  # або інша логіка відповідно до вашого проекту
+
+
+def add_tariff(request):
+    if request.method == 'POST':
+        form = TariffForm(request.POST)
+        if form.is_valid():
+            form.save()
+            # Після успішного додавання тарифу можна перенаправити користувача на іншу сторінку
+            return redirect('finance:main')  # Замініть 'finance:main' на URL-адресу, куди потрібно перенаправити
+    else:
+        form = TariffForm()
+    return render(request, 'finance/add_tariff.html', {'form': form})
+
+def create_tariff(request):
+    if request.method == 'POST':
+        form = TariffForm(request.POST)
+        if form.is_valid():
+            form.save()
+            return redirect('tariff_list')  # Перенаправлення на список тарифів після створення
+    else:
+        form = TariffForm()
+    return render(request, 'tariff.html', {'form': form})
diff --git a/FRONTEND/fastparking/parking/migrations/0002_remove_parkingspace_user_remove_registration_payment_and_more.py b/FRONTEND/fastparking/parking/migrations/0002_remove_parkingspace_user_remove_registration_payment_and_more.py
new file mode 100644
index 00000000..5e74e8cd
--- /dev/null
+++ b/FRONTEND/fastparking/parking/migrations/0002_remove_parkingspace_user_remove_registration_payment_and_more.py
@@ -0,0 +1,42 @@
+# Generated by Django 5.0.4 on 2024-04-14 08:20
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('parking', '0001_initial'),
+        ('photos', '0001_initial'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='parkingspace',
+            name='user',
+        ),
+        migrations.RemoveField(
+            model_name='registration',
+            name='payment',
+        ),
+        migrations.RemoveField(
+            model_name='registration',
+            name='tariff',
+        ),
+        migrations.AddField(
+            model_name='parkingspace',
+            name='registration_id',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='photos.photo'),
+        ),
+        migrations.AlterField(
+            model_name='registration',
+            name='photo_in',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='registration_photo_in', to='photos.photo'),
+        ),
+        migrations.AlterField(
+            model_name='registration',
+            name='photo_out',
+            field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='registration_photo_out', to='photos.photo'),
+        ),
+    ]
diff --git a/FRONTEND/fastparking/parking/models.py b/FRONTEND/fastparking/parking/models.py
index 0d963cf3..5e4f4695 100644
--- a/FRONTEND/fastparking/parking/models.py
+++ b/FRONTEND/fastparking/parking/models.py
@@ -1,6 +1,8 @@
 from django.db import models
 from photos.models import Photo
-
+from django.db import models
+from photos.models import Photo
+from cars.models import Car
 
 
 class ParkingSpace(models.Model):
@@ -11,6 +13,7 @@ class ParkingSpace(models.Model):
     def __str__(self):
         return self.number
 
+
 class Registration(models.Model):
     parking = models.ForeignKey(ParkingSpace, on_delete=models.CASCADE)
     entry_datetime = models.DateTimeField(auto_now_add=True)
@@ -18,10 +21,9 @@ class Registration(models.Model):
     exit_datetime = models.DateTimeField(null=True, blank=True)
     invoice = models.CharField(max_length=255, null=True, blank=True)
     car_number_out = models.CharField(max_length=16, null=True, blank=True)
-    photo_in = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='type.Photo', null=True, blank=True)
-    photo_out = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='type.Photo', null=True, blank=True)
-    car = models.ForeignKey(Photo, on_delete=models.SET_NULL, null=True, blank=True)
+    photo_in = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='registration_photo_in', null=True, blank=True)
+    photo_out = models.ForeignKey(Photo, on_delete=models.SET_NULL, related_name='registration_photo_out', null=True, blank=True)
+    car = models.ForeignKey(Car, on_delete=models.SET_NULL, null=True, blank=True)
 
     def __str__(self):
         return f"Registration ID: {self.id} - Parking ID: {self.parking_id} - Entry Time: {self.entry_datetime}"
-
diff --git a/FRONTEND/fastparking/users/migrations/0003_remove_customuser_cars_customuser_cars.py b/FRONTEND/fastparking/users/migrations/0003_remove_customuser_cars_customuser_cars.py
new file mode 100644
index 00000000..8f28ba3a
--- /dev/null
+++ b/FRONTEND/fastparking/users/migrations/0003_remove_customuser_cars_customuser_cars.py
@@ -0,0 +1,23 @@
+# Generated by Django 5.0.4 on 2024-04-14 08:20
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('cars', '0002_rename_photo_car_photo_car_car_paypass_car_blocked'),
+        ('users', '0002_remove_customuser_cars_customuser_cars'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='customuser',
+            name='cars',
+        ),
+        migrations.AddField(
+            model_name='customuser',
+            name='cars',
+            field=models.ManyToManyField(blank=True, related_name='owners', to='cars.car'),
+        ),
+    ]
diff --git a/Untitled-1.py b/Untitled-1.py
new file mode 100644
index 00000000..785ce99b
--- /dev/null
+++ b/Untitled-1.py
@@ -0,0 +1,7 @@
+registration_car: utc_datetime=datetime.datetime(2024, 4, 13, 23, 32, 24, 651185), registration_data={'photo_id': 5, 'num_auto': 'AI1182HK', 'type': '0'}
+registration_car: utc_datetime=datetime.datetime(2024, 4, 13, 23, 32, 58, 682056), registration_data={'photo_id': 6, 'num_auto': 'AM8417HK', 'type': '1'}
+Я приготцував для Ваc такі запити:
+registration_data = {"photo_id": photo_id, "num_auto": num_auto, "type": type}
+registration_car(utc_datetime, registration_data)
+TYPES = {"0": "IN", "1": "OUT"}
+photos.repository.TYPES (edited) 
\ No newline at end of file

From eb673db6ab56589c248d44eddce13d410a4ce812 Mon Sep 17 00:00:00 2001
From: RostislavB74 <brn.h74@gmail.com>
Date: Sun, 14 Apr 2024 12:56:31 +0300
Subject: [PATCH 07/19] tariff

---
 FRONTEND/fastparking/accounts/urls.py |  25 ++----
 FRONTEND/fastparking/cars/views.py    | 118 ++++++++++++++++++++++++--
 2 files changed, 118 insertions(+), 25 deletions(-)

diff --git a/FRONTEND/fastparking/accounts/urls.py b/FRONTEND/fastparking/accounts/urls.py
index 3e2dace0..43f67916 100644
--- a/FRONTEND/fastparking/accounts/urls.py
+++ b/FRONTEND/fastparking/accounts/urls.py
@@ -1,22 +1,13 @@
-# У вашому файлі urls.py у додатку accounts
-
-# from django.urls import path
-# from . import views
-
-# urlpatterns = [
-#     # Інші URL-шляхи вашого додатку...
-
-#     # URL-шлях для сторінки профілю користувача
-#     path('profile/', views.profile_view, name='profile'),
-# ]
-
-# accounts/urls.py
 from django.urls import path
-from .views import CabinetView
+from . import views
 
 app_name = 'accounts'
 
 urlpatterns = [
-    path('cabinet/', CabinetView.as_view(), name='cabinet'),
-    # Додайте інші URL-шляхи, якщо потрібно
-]
+    
+    path('profile/', views.profile, name='profile'),
+    path('my-cars/', views.my_cars, name='my_cars'),
+    path('add-car/', views.add_car, name='add_car'),
+    path('delete/<int:pk>', views.delete, name='delete'),
+    path('edit-car/<int:pk>/', views.edit_car, name='edit_car'),
+]
\ No newline at end of file
diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index 884fafd1..a43b130b 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -1,8 +1,110 @@
-from django.shortcuts import render
-from django.views.generic import ListView
-from .models import Car
-
-class CarListView(ListView):
-    model = Car
-    template_name = 'car_list.html'  # Шаблон для відображення списку автомобілів
-    context_object_name = 'cars'  # Ім'я змінної в контексті шаблону
\ No newline at end of file
+from django.shortcuts import render, redirect, get_object_or_404
+from django.contrib.auth.decorators import login_required
+
+from .models import MyCars
+from cars.models import Car
+from .forms import MyCarsForm, CarNumberForm
+
+
+
+@login_required
+def profile(request):
+    return render(request, 'accounts/profile.html', {"title": "User profile"})
+
+@login_required
+def my_cars(request):
+    my_cars = MyCars.objects.filter(user=request.user)
+    my_cars_number = Car.objects.filter(user=request.user).values_list('car_number', flat=True)
+    return render(request, 'accounts/my_cars.html', 
+            {
+                "title": "My Cars",
+                "my_cars": my_cars,
+                "my_cars_number": my_cars_number
+    })
+
+
+
+
+@login_required
+def add_car(request):
+    my_cars_form = MyCarsForm()
+    car_number_form = CarNumberForm()
+
+    if request.method == "POST":
+        my_cars_form = MyCarsForm(request.POST)
+        car_number_form = CarNumberForm(request.POST)
+
+        if my_cars_form.is_valid() and car_number_form.is_valid():
+            car_number = car_number_form.cleaned_data.get('car_number')
+            car_instance, created = Car.objects.get_or_create(car_number=car_number)
+
+            
+            new_mycars = my_cars_form.save(commit=False)
+            new_mycars.user = request.user
+            new_mycars.car_number = car_instance  
+            new_mycars.save()
+
+            
+            if hasattr(Car, 'user'):
+                car_instance.user = request.user
+                car_instance.save()
+
+            return redirect(to="accounts:my_cars")
+
+    return render(request, 'accounts/add_car.html', {
+        "title": "Add new car",
+        "my_cars_form": my_cars_form,
+        "car_number_form": car_number_form,
+    })
+
+
+
+@login_required
+def delete(request, pk):
+    my_cars = get_object_or_404(MyCars, pk=pk)
+
+    if request.method == "POST":
+        my_cars.delete()
+        return redirect(to="accounts:my_cars")
+
+    context = {
+        "title": "Delete car",
+        "my_cars": my_cars,
+    }
+
+    return render(request, "accounts/delete.html", context)
+    
+
+
+@login_required
+def edit_car(request, pk):
+    my_cars = get_object_or_404(MyCars, pk=pk)
+
+    if request.method == "POST":
+        my_cars_form = MyCarsForm(request.POST, instance=my_cars)
+        car_number_form = CarNumberForm(request.POST, instance=my_cars.car_number)
+
+        if my_cars_form.is_valid() and car_number_form.is_valid():
+            my_cars_form.save()
+            car_number_form.save()
+
+            return redirect(to="accounts:my_cars", pk=pk)
+
+    else:
+        my_cars_form = MyCarsForm(instance=my_cars)
+        car_number_form = CarNumberForm(instance=my_cars.car_number)
+
+    context = {
+        "title": "Editing car",
+        "my_cars": my_cars,
+        "my_cars_form": my_cars_form,
+        "car_number_form": car_number_form,
+    }
+
+    return render(request, "accounts/edit_car.html", context)
+
+
+
+
+
+

From 3fe3cf32fdf810591f81aa43421a5583790e9591 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:09:57 +0300
Subject: [PATCH 08/19] Update forms.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

два класи для вирішення конфлікту
---
 FRONTEND/fastparking/cars/forms.py | 15 +++++++++++++++
 1 file changed, 15 insertions(+)

diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index a9a16548..45e10b79 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -15,3 +15,18 @@ class Meta:
             'pay_pass': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
             # 'user': forms.Select(attrs={'class': 'form-select'})
         }
+
+
+class MyCarForm(forms.ModelForm):  # додано другий такий самий клас
+    class Meta:
+        model = Car
+        fields = ['car_number', 'predict', 'blocked', 'pay_pass']  # Перерахуйте всі поля, які ви хочете відображати у формі
+
+        widgets = {
+            'car_number': forms.TextInput(attrs={'class': 'form-control'}),
+            'photo_car': forms.FileInput(attrs={'class': 'form-control'}),
+            'predict': forms.NumberInput(attrs={'class': 'form-control'}),
+            'blocked': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
+            'pay_pass': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
+            # 'user': forms.Select(attrs={'class': 'form-select'})
+        }

From c789d979a02d0352d3c9739558843f17e4c20730 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:13:24 +0300
Subject: [PATCH 09/19] Update views.py
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

from .forms import CarForm, AnotherCarForm  # Оновлено імпорт
---
 FRONTEND/fastparking/accounts/views.py | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/accounts/views.py b/FRONTEND/fastparking/accounts/views.py
index 23c03db4..76e7b45a 100644
--- a/FRONTEND/fastparking/accounts/views.py
+++ b/FRONTEND/fastparking/accounts/views.py
@@ -2,7 +2,9 @@
 from django.contrib.auth.decorators import login_required
 from django.views import View
 from django.utils.decorators import method_decorator
-from .forms import CarForm
+# from .forms import CarForm
+from .forms import CarForm, MyCarForm  # Оновлено імпорт
+
 
 # @method_decorator(login_required, name='dispatch')
 # class CabinetView(View):

From cfbedbd2cfc7752311d6da3fe9349b4bc2b1a90e Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:19:56 +0300
Subject: [PATCH 10/19] Update forms.py

comment CarForm
---
 FRONTEND/fastparking/cars/forms.py | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)

diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index 45e10b79..a1f43b48 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -2,19 +2,19 @@
 from django import forms
 from .models import Car
 
-class CarForm(forms.ModelForm):
-    class Meta:
-        model = Car
-        fields = ['car_number', 'predict', 'blocked', 'pay_pass']  # Перерахуйте всі поля, які ви хочете відображати у формі
+# class CarForm(forms.ModelForm):
+#     class Meta:
+#         model = Car
+#         fields = ['car_number', 'predict', 'blocked', 'pay_pass']  # Перерахуйте всі поля, які ви хочете відображати у формі
 
-        widgets = {
-            'car_number': forms.TextInput(attrs={'class': 'form-control'}),
-            'photo_car': forms.FileInput(attrs={'class': 'form-control'}),
-            'predict': forms.NumberInput(attrs={'class': 'form-control'}),
-            'blocked': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
-            'pay_pass': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
-            # 'user': forms.Select(attrs={'class': 'form-select'})
-        }
+#         widgets = {
+#             'car_number': forms.TextInput(attrs={'class': 'form-control'}),
+#             'photo_car': forms.FileInput(attrs={'class': 'form-control'}),
+#             'predict': forms.NumberInput(attrs={'class': 'form-control'}),
+#             'blocked': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
+#             'pay_pass': forms.CheckboxInput(attrs={'class': 'form-check-input'}),
+#             # 'user': forms.Select(attrs={'class': 'form-select'})
+#         }
 
 
 class MyCarForm(forms.ModelForm):  # додано другий такий самий клас

From 15525c469faf427ed512ff93248a1406b05ac336 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:33:15 +0300
Subject: [PATCH 11/19] Update models.py

class MyCars
---
 FRONTEND/fastparking/cars/models.py | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/FRONTEND/fastparking/cars/models.py b/FRONTEND/fastparking/cars/models.py
index 32f994d5..44b8146b 100644
--- a/FRONTEND/fastparking/cars/models.py
+++ b/FRONTEND/fastparking/cars/models.py
@@ -30,3 +30,6 @@ def __str__(self):
 
     def get_absolute_url(self):
         return reverse("car_list", kwargs={"pk": self.pk})
+
+class MyCars(models.Model):
+    pass

From 23e25ca75bedbdf80f72fa92987d698d509237e5 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:38:16 +0300
Subject: [PATCH 12/19] Update forms.py

pay_pass to PayPass
---
 FRONTEND/fastparking/cars/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index a1f43b48..493e0db0 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -20,7 +20,7 @@
 class MyCarForm(forms.ModelForm):  # додано другий такий самий клас
     class Meta:
         model = Car
-        fields = ['car_number', 'predict', 'blocked', 'pay_pass']  # Перерахуйте всі поля, які ви хочете відображати у формі
+        fields = ['car_number', 'predict', 'blocked', 'PayPass']  # Перерахуйте всі поля, які ви хочете відображати у формі
 
         widgets = {
             'car_number': forms.TextInput(attrs={'class': 'form-control'}),

From d107725d4b804a84b01d038c1b1df5f3b46cff2e Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:41:52 +0300
Subject: [PATCH 13/19] Update forms.py

from .forms import MyCarForm
---
 FRONTEND/fastparking/cars/forms.py | 1 +
 1 file changed, 1 insertion(+)

diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index 493e0db0..52e175dd 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -1,6 +1,7 @@
 # forms.py
 from django import forms
 from .models import Car
+from .forms import MyCarForm
 
 # class CarForm(forms.ModelForm):
 #     class Meta:

From d251bf65b24795a51abf069a6de552afbc7f6c79 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:43:07 +0300
Subject: [PATCH 14/19] Update views.py

MyCarsForm to MyCarForm
---
 FRONTEND/fastparking/cars/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index a43b130b..d35eba33 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -3,7 +3,7 @@
 
 from .models import MyCars
 from cars.models import Car
-from .forms import MyCarsForm, CarNumberForm
+from .forms import MyCarForm, CarNumberForm
 
 
 

From d73b7ce53821cd42b6c4957cd29ed106ce24c25a Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:46:42 +0300
Subject: [PATCH 15/19] Update views.py

from .forms import --MyCarForm, CarNumberForm
---
 FRONTEND/fastparking/cars/views.py | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index d35eba33..20fa536c 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -3,8 +3,8 @@
 
 from .models import MyCars
 from cars.models import Car
-from .forms import MyCarForm, CarNumberForm
-
+from .forms import CarNumberForm
+# from .forms import MyCarForm, CarNumberForm
 
 
 @login_required

From b2064cf6f7ce76e3a41cfcf6196b40bc2ccf69b1 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:50:03 +0300
Subject: [PATCH 16/19] Update forms.py

comment
---
 FRONTEND/fastparking/cars/forms.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/forms.py b/FRONTEND/fastparking/cars/forms.py
index 52e175dd..9513cdb5 100644
--- a/FRONTEND/fastparking/cars/forms.py
+++ b/FRONTEND/fastparking/cars/forms.py
@@ -1,7 +1,7 @@
 # forms.py
 from django import forms
 from .models import Car
-from .forms import MyCarForm
+# from .forms import MyCarForm
 
 # class CarForm(forms.ModelForm):
 #     class Meta:

From 61ac1cf4675a3f6fd2e2936b66f4c1c4e0a43651 Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:53:08 +0300
Subject: [PATCH 17/19] Update views.py

--CarNumberForm
---
 FRONTEND/fastparking/cars/views.py | 1 -
 1 file changed, 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index 20fa536c..594e71ab 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -3,7 +3,6 @@
 
 from .models import MyCars
 from cars.models import Car
-from .forms import CarNumberForm
 # from .forms import MyCarForm, CarNumberForm
 
 

From df830b0f5dd713c37b4a9f67808e4dfa1d83c0dd Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 17:59:00 +0300
Subject: [PATCH 18/19] Update views.py

add class CarListView(ListView):
---
 FRONTEND/fastparking/cars/views.py | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index 594e71ab..08ffd24e 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -103,7 +103,10 @@ def edit_car(request, pk):
     return render(request, "accounts/edit_car.html", context)
 
 
-
+class CarListView(ListView):
+    model = Car
+    template_name = 'car_list.html'  # Шаблон для відображення списку автомобілів
+    context_object_name = 'cars'  # Ім'я змінної в контексті шаблону
 
 
 

From 88ae61255259222b07efaaa35e3d76411b7e2d7b Mon Sep 17 00:00:00 2001
From: AlexanderBgit <133023524+AlexanderBgit@users.noreply.github.com>
Date: Sun, 14 Apr 2024 18:01:15 +0300
Subject: [PATCH 19/19] Update views.py

from django.views.generic import ListView
---
 FRONTEND/fastparking/cars/views.py | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/FRONTEND/fastparking/cars/views.py b/FRONTEND/fastparking/cars/views.py
index 08ffd24e..27239610 100644
--- a/FRONTEND/fastparking/cars/views.py
+++ b/FRONTEND/fastparking/cars/views.py
@@ -4,7 +4,7 @@
 from .models import MyCars
 from cars.models import Car
 # from .forms import MyCarForm, CarNumberForm
-
+from django.views.generic import ListView
 
 @login_required
 def profile(request):