diff --git a/core/__pycache__/admin.cpython-311.pyc b/core/__pycache__/admin.cpython-311.pyc index a5ed392..edb7428 100644 Binary files a/core/__pycache__/admin.cpython-311.pyc and b/core/__pycache__/admin.cpython-311.pyc differ diff --git a/core/__pycache__/models.cpython-311.pyc b/core/__pycache__/models.cpython-311.pyc index e061640..ad86ac6 100644 Binary files a/core/__pycache__/models.cpython-311.pyc and b/core/__pycache__/models.cpython-311.pyc differ diff --git a/core/__pycache__/urls.cpython-311.pyc b/core/__pycache__/urls.cpython-311.pyc index 5a69659..8e219cc 100644 Binary files a/core/__pycache__/urls.cpython-311.pyc and b/core/__pycache__/urls.cpython-311.pyc differ diff --git a/core/__pycache__/views.cpython-311.pyc b/core/__pycache__/views.cpython-311.pyc index 2a36fd6..a7e7f85 100644 Binary files a/core/__pycache__/views.cpython-311.pyc and b/core/__pycache__/views.cpython-311.pyc differ diff --git a/core/admin.py b/core/admin.py index 8c38f3f..a0a056c 100644 --- a/core/admin.py +++ b/core/admin.py @@ -1,3 +1,31 @@ from django.contrib import admin +from .models import Category, FleetUnit, Maintenance, Breakdown, PartRequest, Document -# Register your models here. +@admin.register(Category) +class CategoryAdmin(admin.ModelAdmin): + list_display = ('name',) + +@admin.register(FleetUnit) +class FleetUnitAdmin(admin.ModelAdmin): + list_display = ('name', 'category', 'plate_number', 'status', 'year') + list_filter = ('status', 'category') + search_fields = ('name', 'vin', 'plate_number') + +@admin.register(Maintenance) +class MaintenanceAdmin(admin.ModelAdmin): + list_display = ('fleet_unit', 'm_type', 'planned_date', 'status') + list_filter = ('status', 'm_type') + +@admin.register(Breakdown) +class BreakdownAdmin(admin.ModelAdmin): + list_display = ('fleet_unit', 'system_node', 'status', 'date') + list_filter = ('status',) + +@admin.register(PartRequest) +class PartRequestAdmin(admin.ModelAdmin): + list_display = ('part_name', 'fleet_unit', 'status', 'quantity') + list_filter = ('status',) + +@admin.register(Document) +class DocumentAdmin(admin.ModelAdmin): + list_display = ('doc_type', 'fleet_unit', 'uploaded_at') \ No newline at end of file diff --git a/core/migrations/0001_initial.py b/core/migrations/0001_initial.py new file mode 100644 index 0000000..517e3dd --- /dev/null +++ b/core/migrations/0001_initial.py @@ -0,0 +1,119 @@ +# Generated by Django 5.2.7 on 2026-01-27 18:13 + +import django.db.models.deletion +from django.db import migrations, models + + +class Migration(migrations.Migration): + + initial = True + + dependencies = [ + ] + + operations = [ + migrations.CreateModel( + name='Category', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=100, verbose_name='Наименование')), + ], + options={ + 'verbose_name': 'Категория', + 'verbose_name_plural': 'Категории', + }, + ), + migrations.CreateModel( + name='FleetUnit', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('name', models.CharField(max_length=255, verbose_name='Наименование')), + ('model_name', models.CharField(max_length=255, verbose_name='Модель')), + ('vin', models.CharField(max_length=100, unique=True, verbose_name='VIN / Серийный номер')), + ('plate_number', models.CharField(blank=True, max_length=50, null=True, verbose_name='Госномер')), + ('year', models.PositiveIntegerField(verbose_name='Год выпуска')), + ('photo', models.ImageField(blank=True, null=True, upload_to='fleet_photos/', verbose_name='Фото')), + ('status', models.CharField(choices=[('active', 'В работе'), ('idle', 'Простаивает'), ('broken', 'Сломана'), ('repair', 'В ремонте'), ('waiting_parts', 'Ждёт деталь')], default='active', max_length=20, verbose_name='Статус')), + ('commissioning_date', models.DateField(verbose_name='Дата ввода в эксплуатацию')), + ('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('updated_at', models.DateTimeField(auto_now=True)), + ('category', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.SET_NULL, to='core.category', verbose_name='Категория')), + ], + options={ + 'verbose_name': 'Техника', + 'verbose_name_plural': 'Техника', + 'ordering': ['-created_at'], + }, + ), + migrations.CreateModel( + name='Breakdown', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('date', models.DateField(auto_now_add=True, verbose_name='Дата')), + ('system_node', models.CharField(max_length=255, verbose_name='Узел / система')), + ('description', models.TextField(verbose_name='Описание')), + ('status', models.CharField(choices=[('reported', 'Заявлено'), ('repaired', 'Отремонтировано'), ('need_part', 'Нужна деталь')], default='reported', max_length=20, verbose_name='Статус')), + ('repair_date', models.DateField(blank=True, null=True, verbose_name='Дата ремонта')), + ('cost', models.DecimalField(blank=True, decimal_places=2, max_digits=10, null=True, verbose_name='Стоимость')), + ('fleet_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='breakdowns', to='core.fleetunit', verbose_name='Техника')), + ], + options={ + 'verbose_name': 'Поломка', + 'verbose_name_plural': 'Поломки', + }, + ), + migrations.CreateModel( + name='Maintenance', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('m_type', models.CharField(choices=[('TO-250', 'ТО-250'), ('TO-500', 'ТО-500'), ('seasonal', 'Сезонное'), ('individual', 'Индивидуальное')], max_length=50, verbose_name='Тип ТО')), + ('planned_date', models.DateField(verbose_name='Плановая дата')), + ('planned_runtime', models.PositiveIntegerField(verbose_name='Плановый пробег / моточасы')), + ('status', models.CharField(choices=[('planned', 'Планируется'), ('in_progress', 'В процессе'), ('completed', 'Выполнено')], default='planned', max_length=20, verbose_name='Статус')), + ('actual_date', models.DateField(blank=True, null=True, verbose_name='Фактическая дата')), + ('actual_runtime', models.PositiveIntegerField(blank=True, null=True, verbose_name='Фактический пробег / моточасы')), + ('notes', models.TextField(blank=True, null=True, verbose_name='Примечания')), + ('fleet_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='maintenances', to='core.fleetunit', verbose_name='Техника')), + ], + options={ + 'verbose_name': 'ТО', + 'verbose_name_plural': 'ТО', + }, + ), + migrations.CreateModel( + name='PartRequest', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('part_name', models.CharField(max_length=255, verbose_name='Наименование детали')), + ('article_number', models.CharField(blank=True, max_length=100, null=True, verbose_name='Артикул')), + ('quantity', models.PositiveIntegerField(default=1, verbose_name='Количество')), + ('status', models.CharField(choices=[('draft', 'Черновик'), ('sent', 'Отправлено'), ('ordered', 'Заказано'), ('delivered', 'Доставлено')], default='draft', max_length=20, verbose_name='Статус')), + ('photo', models.ImageField(blank=True, null=True, upload_to='part_photos/', verbose_name='Фото')), + ('notes', models.TextField(blank=True, null=True, verbose_name='Примечание')), + ('created_at', models.DateTimeField(auto_now_add=True)), + ('fleet_unit', models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='part_requests', to='core.fleetunit', verbose_name='Техника')), + ], + options={ + 'verbose_name': 'Заявка на запчасть', + 'verbose_name_plural': 'Заявки на запчасти', + }, + ), + migrations.CreateModel( + name='Document', + fields=[ + ('id', models.BigAutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('doc_type', models.CharField(choices=[('passport', 'Паспорт'), ('maintenance_act', 'Акт ТО'), ('photo', 'Фото'), ('invoice', 'Счет')], max_length=50, verbose_name='Тип документа')), + ('file', models.FileField(upload_to='documents/', verbose_name='Файл')), + ('uploaded_at', models.DateTimeField(auto_now_add=True, verbose_name='Дата добавления')), + ('breakdown', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='core.breakdown')), + ('fleet_unit', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='core.fleetunit')), + ('maintenance', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='core.maintenance')), + ('part_request', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='documents', to='core.partrequest')), + ], + options={ + 'verbose_name': 'Документ', + 'verbose_name_plural': 'Документы', + }, + ), + ] diff --git a/core/migrations/__pycache__/0001_initial.cpython-311.pyc b/core/migrations/__pycache__/0001_initial.cpython-311.pyc new file mode 100644 index 0000000..7e72f51 Binary files /dev/null and b/core/migrations/__pycache__/0001_initial.cpython-311.pyc differ diff --git a/core/models.py b/core/models.py index 71a8362..35097bc 100644 --- a/core/models.py +++ b/core/models.py @@ -1,3 +1,158 @@ from django.db import models +from django.urls import reverse -# Create your models here. +class Category(models.Model): + name = models.CharField(max_length=100, verbose_name="Наименование") + + class Meta: + verbose_name = "Категория" + verbose_name_plural = "Категории" + + def __str__(self): + return self.name + +class FleetUnit(models.Model): + STATUS_CHOICES = [ + ('active', 'В работе'), + ('idle', 'Простаивает'), + ('broken', 'Сломана'), + ('repair', 'В ремонте'), + ('waiting_parts', 'Ждёт деталь'), + ] + + name = models.CharField(max_length=255, verbose_name="Наименование") + category = models.ForeignKey(Category, on_delete=models.SET_NULL, null=True, blank=True, verbose_name="Категория") + model_name = models.CharField(max_length=255, verbose_name="Модель") + vin = models.CharField(max_length=100, unique=True, verbose_name="VIN / Серийный номер") + plate_number = models.CharField(max_length=50, blank=True, null=True, verbose_name="Госномер") + year = models.PositiveIntegerField(verbose_name="Год выпуска") + photo = models.ImageField(upload_to='fleet_photos/', blank=True, null=True, verbose_name="Фото") + status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='active', verbose_name="Статус") + commissioning_date = models.DateField(verbose_name="Дата ввода в эксплуатацию") + notes = models.TextField(blank=True, null=True, verbose_name="Примечания") + + created_at = models.DateTimeField(auto_now_add=True) + updated_at = models.DateTimeField(auto_now=True) + + class Meta: + verbose_name = "Техника" + verbose_name_plural = "Техника" + ordering = ['-created_at'] + + def __str__(self): + return f"{self.name} ({self.plate_number or self.vin})" + + def get_absolute_url(self): + return reverse('fleet_detail', kwargs={'pk': self.pk}) + + def get_status_color(self): + colors = { + 'active': 'success', + 'idle': 'secondary', + 'broken': 'danger', + 'repair': 'warning', + 'waiting_parts': 'info', + } + return colors.get(self.status, 'primary') + +class Maintenance(models.Model): + TYPE_CHOICES = [ + ('TO-250', 'ТО-250'), + ('TO-500', 'ТО-500'), + ('seasonal', 'Сезонное'), + ('individual', 'Индивидуальное'), + ] + STATUS_CHOICES = [ + ('planned', 'Планируется'), + ('in_progress', 'В процессе'), + ('completed', 'Выполнено'), + ] + + fleet_unit = models.ForeignKey(FleetUnit, on_delete=models.CASCADE, related_name='maintenances', verbose_name="Техника") + m_type = models.CharField(max_length=50, choices=TYPE_CHOICES, verbose_name="Тип ТО") + planned_date = models.DateField(verbose_name="Плановая дата") + planned_runtime = models.PositiveIntegerField(verbose_name="Плановый пробег / моточасы") + status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='planned', verbose_name="Статус") + + actual_date = models.DateField(null=True, blank=True, verbose_name="Фактическая дата") + actual_runtime = models.PositiveIntegerField(null=True, blank=True, verbose_name="Фактический пробег / моточасы") + + notes = models.TextField(blank=True, null=True, verbose_name="Примечания") + + class Meta: + verbose_name = "ТО" + verbose_name_plural = "ТО" + + def __str__(self): + return f"{self.m_type} - {self.fleet_unit.name} ({self.planned_date})" + +class Breakdown(models.Model): + STATUS_CHOICES = [ + ('reported', 'Заявлено'), + ('repaired', 'Отремонтировано'), + ('need_part', 'Нужна деталь'), + ] + + fleet_unit = models.ForeignKey(FleetUnit, on_delete=models.CASCADE, related_name='breakdowns', verbose_name="Техника") + date = models.DateField(auto_now_add=True, verbose_name="Дата") + system_node = models.CharField(max_length=255, verbose_name="Узел / система") + description = models.TextField(verbose_name="Описание") + status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='reported', verbose_name="Статус") + repair_date = models.DateField(null=True, blank=True, verbose_name="Дата ремонта") + cost = models.DecimalField(max_digits=10, decimal_places=2, null=True, blank=True, verbose_name="Стоимость") + + class Meta: + verbose_name = "Поломка" + verbose_name_plural = "Поломки" + + def __str__(self): + return f"Поломка: {self.fleet_unit.name} - {self.system_node}" + +class PartRequest(models.Model): + STATUS_CHOICES = [ + ('draft', 'Черновик'), + ('sent', 'Отправлено'), + ('ordered', 'Заказано'), + ('delivered', 'Доставлено'), + ] + + fleet_unit = models.ForeignKey(FleetUnit, on_delete=models.CASCADE, related_name='part_requests', verbose_name="Техника") + part_name = models.CharField(max_length=255, verbose_name="Наименование детали") + article_number = models.CharField(max_length=100, blank=True, null=True, verbose_name="Артикул") + quantity = models.PositiveIntegerField(default=1, verbose_name="Количество") + status = models.CharField(max_length=20, choices=STATUS_CHOICES, default='draft', verbose_name="Статус") + photo = models.ImageField(upload_to='part_photos/', blank=True, null=True, verbose_name="Фото") + notes = models.TextField(blank=True, null=True, verbose_name="Примечание") + + created_at = models.DateTimeField(auto_now_add=True) + + class Meta: + verbose_name = "Заявка на запчасть" + verbose_name_plural = "Заявки на запчасти" + + def __str__(self): + return f"{self.part_name} for {self.fleet_unit.name}" + +class Document(models.Model): + TYPE_CHOICES = [ + ('passport', 'Паспорт'), + ('maintenance_act', 'Акт ТО'), + ('photo', 'Фото'), + ('invoice', 'Счет'), + ] + + doc_type = models.CharField(max_length=50, choices=TYPE_CHOICES, verbose_name="Тип документа") + fleet_unit = models.ForeignKey(FleetUnit, on_delete=models.CASCADE, related_name='documents', null=True, blank=True) + maintenance = models.ForeignKey(Maintenance, on_delete=models.CASCADE, related_name='documents', null=True, blank=True) + breakdown = models.ForeignKey(Breakdown, on_delete=models.CASCADE, related_name='documents', null=True, blank=True) + part_request = models.ForeignKey(PartRequest, on_delete=models.CASCADE, related_name='documents', null=True, blank=True) + + file = models.FileField(upload_to='documents/', verbose_name="Файл") + uploaded_at = models.DateTimeField(auto_now_add=True, verbose_name="Дата добавления") + + class Meta: + verbose_name = "Документ" + verbose_name_plural = "Документы" + + def __str__(self): + return f"{self.get_doc_type_display()} - {self.uploaded_at}" diff --git a/core/templates/base.html b/core/templates/base.html index 1e7e5fb..c5be69c 100644 --- a/core/templates/base.html +++ b/core/templates/base.html @@ -1,25 +1,80 @@ +{% load static %} - - + - - {% block title %}Knowledge Base{% endblock %} - {% if project_description %} - - - - {% endif %} - {% if project_image_url %} - - - {% endif %} - {% load static %} - - {% block head %}{% endblock %} + + + {% block title %}Fleet Manager{% endblock %} + + + + + + + + + + + + + + + {% block extra_css %}{% endblock %} + + + - - {% block content %}{% endblock %} +
+
+ {% block content %}{% endblock %} +
+
+ + + + + + {% block extra_js %}{% endblock %} - - + \ No newline at end of file diff --git a/core/templates/core/fleet_detail.html b/core/templates/core/fleet_detail.html new file mode 100644 index 0000000..13657bc --- /dev/null +++ b/core/templates/core/fleet_detail.html @@ -0,0 +1,186 @@ +{% extends 'base.html' %} + +{% block title %}{{ unit.name }} | Fleet Manager{% endblock %} + +{% block content %} +
+ +
+

{{ unit.name }}

+
+ + Редактировать + + +
+
+
+ +
+
+ +
+
+
+ {% if unit.photo %} + {{ unit.name }} + {% else %} +
+ +
+ {% endif %} +
+
+
+
+ + {{ unit.get_status_display }} + +
ID: {{ unit.pk }}
+
+ +
+
+ + {{ unit.category|default:"Не указана" }} +
+
+ + {{ unit.model_name }} +
+
+ + {{ unit.plate_number|default:"-" }} +
+
+ + {{ unit.year }} +
+
+ + {{ unit.vin }} +
+
+ + {{ unit.commissioning_date|date:"d.m.Y" }} +
+
+
+
+
+
+ + +
+
+ +
+
+
+
+
+ + + + + + + + + + + {% for m in maintenances %} + + + + + + + {% empty %} + + {% endfor %} + +
ТипДатаПробег/мчСтатус
{{ m.m_type }}{{ m.planned_date|date:"d.m.Y" }}{{ m.planned_runtime }}{{ m.get_status_display }}
История ТО пуста
+
+
+
+
Журнал поломок пуст
+
+
+
Заявок на запчасти нет
+
+
+
Документы не загружены
+
+
+
+
+
+ +
+ +
+
+
Действия
+
+ + + +
+
+
+ + +
+
+
QR-код техники
+
+ +
+ +
+
+

Отсканируйте для быстрого доступа с мобильного телефона

+ +
+
+ + +
+
+
Примечания
+

{{ unit.notes|default:"Примечания отсутствуют" }}

+
+
+
+
+{% endblock %} diff --git a/core/templates/core/fleet_form.html b/core/templates/core/fleet_form.html new file mode 100644 index 0000000..d9bc7eb --- /dev/null +++ b/core/templates/core/fleet_form.html @@ -0,0 +1,115 @@ +{% extends 'base.html' %} +{% load static %} + +{% block title %} + {% if object %}Редактирование {{ object.name }}{% else %}Добавление техники{% endif %} | Fleet Manager +{% endblock %} + +{% block content %} +
+
+
+ +

{% if object %}Редактирование {{ object.name }}{% else %}Новая единица техники{% endif %}

+
+ +
+
+
+ {% csrf_token %} + +
+
+ + {{ form.name }} + {% if form.name.errors %}
{{ form.name.errors }}
{% endif %} +
+ +
+ + {{ form.category }} + {% if form.category.errors %}
{{ form.category.errors }}
{% endif %} +
+ +
+ + {{ form.model_name }} + {% if form.model_name.errors %}
{{ form.model_name.errors }}
{% endif %} +
+ +
+ + {{ form.vin }} + {% if form.vin.errors %}
{{ form.vin.errors }}
{% endif %} +
+ +
+ + {{ form.plate_number }} + {% if form.plate_number.errors %}
{{ form.plate_number.errors }}
{% endif %} +
+ +
+ + {{ form.year }} + {% if form.year.errors %}
{{ form.year.errors }}
{% endif %} +
+ +
+ + {{ form.status }} + {% if form.status.errors %}
{{ form.status.errors }}
{% endif %} +
+ +
+ + {{ form.commissioning_date }} +
ГГГГ-ММ-ДД
+ {% if form.commissioning_date.errors %}
{{ form.commissioning_date.errors }}
{% endif %} +
+ +
+ + {{ form.photo }} + {% if form.photo.errors %}
{{ form.photo.errors }}
{% endif %} +
+ +
+ + {{ form.notes }} + {% if form.notes.errors %}
{{ form.notes.errors }}
{% endif %} +
+
+ +
+ + Отмена +
+
+
+
+
+
+ + +{% endblock %} diff --git a/core/templates/core/fleet_list.html b/core/templates/core/fleet_list.html new file mode 100644 index 0000000..5f7a38a --- /dev/null +++ b/core/templates/core/fleet_list.html @@ -0,0 +1,119 @@ +{% extends 'base.html' %} + +{% block title %}Список техники | Fleet Manager{% endblock %} + +{% block content %} +
+
+

Парк техники

+ +
+ + Добавить технику + +
+ + +
+
+
+
+
+ + +
+
+
+ +
+
+ +
+
+
+
+ +
+ {% for unit in units %} +
+
+
+
+ {% if unit.photo %} + {{ unit.name }} + {% else %} +
+ +
+ {% endif %} +
+
+
+
+ + {{ unit.get_status_display }} + + #{{ unit.pk }} +
+
+ {{ unit.name }} +
+

+ {{ unit.model_name }} | {{ unit.plate_number|default:unit.vin }} +

+
+
+ {{ unit.year }} +
+ Подробнее +
+
+
+
+
+
+ {% empty %} +
+
+ +
+

Техника не найдена

+

Попробуйте изменить параметры поиска или добавить новую единицу.

+ Добавить технику +
+ {% endfor %} +
+ + +{% if is_paginated %} + +{% endif %} +{% endblock %} diff --git a/core/templates/core/index.html b/core/templates/core/index.html index faec813..5018798 100644 --- a/core/templates/core/index.html +++ b/core/templates/core/index.html @@ -1,145 +1,154 @@ -{% extends "base.html" %} +{% extends 'base.html' %} -{% block title %}{{ project_name }}{% endblock %} - -{% block head %} - - - - -{% endblock %} +{% block title %}Дашборд | Fleet Manager{% endblock %} {% block content %} -
-
-

Analyzing your requirements and generating your app…

-
- Loading… +
+
+
+
+

Управление парком техники

+

Централизованная система контроля, обслуживания и учета вашей техники.

+
+ + Добавить технику + + + Весь список + +
+
+
-

AppWizzy AI is collecting your requirements and applying the first changes.

-

This page will refresh automatically as the plan is implemented.

-

- Runtime: Django {{ django_version }} · Python {{ python_version }} - — UTC {{ current_time|date:"Y-m-d H:i:s" }} -

-
-
- -{% endblock %} \ No newline at end of file + + +
+
+
+
+ +
+
+
Всего единиц
+
{{ total_units }}
+
+
+
+
+
+
+ +
+
+
В работе
+
{{ active_units }}
+
+
+
+
+
+
+ +
+
+
Сломано
+
{{ broken_units }}
+
+
+
+
+
+
+ +
+
+
В ремонте
+
{{ repair_units }}
+
+
+
+
+ +
+
+
+
+
Предстоящие ТО
+ Все ТО +
+
+
+ + + + + + + + + + + {% for m in recent_maintenances %} + + + + + + + {% empty %} + + + + {% endfor %} + +
ТехникаТипДатаСтатус
{{ m.fleet_unit.name }}{{ m.m_type }}{{ m.planned_date|date:"d.m.Y" }} + + {{ m.get_status_display }} + +
Нет запланированных ТО
+
+
+
+
+
+
+
+
Последние поломки
+ Журнал +
+
+
+ + + + + + + + + + + {% for b in recent_breakdowns %} + + + + + + + {% empty %} + + + + {% endfor %} + +
ТехникаУзелДатаСтатус
{{ b.fleet_unit.name }}{{ b.system_node }}{{ b.date|date:"d.m.Y" }} + + {{ b.get_status_display }} + +
Поломок не зафиксировано
+
+
+
+
+
+{% endblock %} diff --git a/core/urls.py b/core/urls.py index 6299e3d..8a75e00 100644 --- a/core/urls.py +++ b/core/urls.py @@ -1,7 +1,10 @@ from django.urls import path - -from .views import home +from . import views urlpatterns = [ - path("", home, name="home"), -] + path('', views.IndexView.as_view(), name='index'), + path('fleet/', views.FleetListView.as_view(), name='fleet_list'), + path('fleet//', views.FleetDetailView.as_view(), name='fleet_detail'), + path('fleet/add/', views.FleetCreateView.as_view(), name='fleet_add'), + path('fleet//edit/', views.FleetUpdateView.as_view(), name='fleet_edit'), +] \ No newline at end of file diff --git a/core/views.py b/core/views.py index c9aed12..c649a25 100644 --- a/core/views.py +++ b/core/views.py @@ -1,25 +1,75 @@ -import os -import platform - -from django import get_version as django_version from django.shortcuts import render -from django.utils import timezone +from django.views.generic import ListView, DetailView, CreateView, UpdateView, TemplateView +from django.urls import reverse_lazy +from django import forms +from django.db.models import Count +from .models import FleetUnit, Maintenance, Breakdown, PartRequest, Category +class FleetUnitForm(forms.ModelForm): + class Meta: + model = FleetUnit + fields = ['name', 'category', 'model_name', 'vin', 'plate_number', 'year', 'photo', 'status', 'commissioning_date', 'notes'] + widgets = { + 'commissioning_date': forms.DateInput(attrs={'type': 'date'}), + 'notes': forms.Textarea(attrs={'rows': 3}), + } -def home(request): - """Render the landing screen with loader and environment details.""" - host_name = request.get_host().lower() - agent_brand = "AppWizzy" if host_name == "appwizzy.com" else "Flatlogic" - now = timezone.now() +class IndexView(TemplateView): + template_name = 'core/index.html' - context = { - "project_name": "New Style", - "agent_brand": agent_brand, - "django_version": django_version(), - "python_version": platform.python_version(), - "current_time": now, - "host_name": host_name, - "project_description": os.getenv("PROJECT_DESCRIPTION", ""), - "project_image_url": os.getenv("PROJECT_IMAGE_URL", ""), - } - return render(request, "core/index.html", context) + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['total_units'] = FleetUnit.objects.count() + context['active_units'] = FleetUnit.objects.filter(status='active').count() + context['broken_units'] = FleetUnit.objects.filter(status='broken').count() + context['repair_units'] = FleetUnit.objects.filter(status='repair').count() + + # Stats for charts or badges + context['status_counts'] = FleetUnit.objects.values('status').annotate(total=Count('status')) + + context['recent_maintenances'] = Maintenance.objects.all().order_by('-planned_date')[:5] + context['recent_breakdowns'] = Breakdown.objects.all().order_by('-date')[:5] + + return context + +class FleetListView(ListView): + model = FleetUnit + template_name = 'core/fleet_list.html' + context_object_name = 'units' + paginate_by = 12 + + def get_queryset(self): + queryset = super().get_queryset() + status = self.request.GET.get('status') + if status: + queryset = queryset.filter(status=status) + search = self.request.GET.get('search') + if search: + queryset = queryset.filter(name__icontains=search) | queryset.filter(plate_number__icontains=search) | queryset.filter(vin__icontains=search) + return queryset + +class FleetDetailView(DetailView): + model = FleetUnit + template_name = 'core/fleet_detail.html' + context_object_name = 'unit' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + context['maintenances'] = self.object.maintenances.all() + context['breakdowns'] = self.object.breakdowns.all() + context['part_requests'] = self.object.part_requests.all() + return context + +class FleetCreateView(CreateView): + model = FleetUnit + template_name = 'core/fleet_form.html' + form_class = FleetUnitForm + success_url = reverse_lazy('fleet_list') + +class FleetUpdateView(UpdateView): + model = FleetUnit + template_name = 'core/fleet_form.html' + form_class = FleetUnitForm + + def get_success_url(self): + return reverse_lazy('fleet_detail', kwargs={'pk': self.object.pk}) \ No newline at end of file diff --git a/static/css/custom.css b/static/css/custom.css index 925f6ed..424cf4a 100644 --- a/static/css/custom.css +++ b/static/css/custom.css @@ -1,4 +1,116 @@ -/* Custom styles for the application */ -body { - font-family: system-ui, -apple-system, sans-serif; +:root { + --bg-slate-900: #1e293b; + --text-blue-500: #3b82f6; + --primary: #3b82f6; + --secondary: #64748b; + --success: #10b981; + --danger: #ef4444; + --warning: #f59e0b; + --info: #06b6d4; } + +body { + font-family: 'Inter', sans-serif; + color: #334155; +} + +h1, h2, h3, h4, h5, h6 { + font-family: 'Montserrat', sans-serif; + font-weight: 700; +} + +.bg-slate-900 { + background-color: var(--bg-slate-900) !important; +} + +.text-blue-500 { + color: var(--text-blue-500) !important; +} + +.tracking-wider { + letter-spacing: 0.05em; +} + +/* Card Styling */ +.card { + border: none; + border-radius: 12px; + transition: transform 0.2s ease, box-shadow 0.2s ease; +} + +.card:hover { + transform: translateY(-2px); + box-shadow: 0 10px 15px -3px rgba(0, 0, 0, 0.1), 0 4px 6px -2px rgba(0, 0, 0, 0.05) !important; +} + +/* Stat Cards */ +.stat-card { + padding: 1.5rem; + display: flex; + align-items: center; +} + +.stat-icon { + width: 48px; + height: 48px; + border-radius: 12px; + display: flex; + align-items: center; + justify-content: center; + font-size: 1.5rem; + margin-right: 1rem; +} + +/* Badges */ +.badge { + padding: 0.5em 0.8em; + font-weight: 500; + border-radius: 6px; +} + +/* Hero Section */ +.hero-gradient { + background: linear-gradient(135deg, #1e293b 0%, #334155 100%); + color: white; + padding: 3rem 0; + border-radius: 16px; + margin-bottom: 2rem; +} + +/* Form Styling */ +.form-control, .form-select { + border-radius: 8px; + padding: 0.625rem 0.75rem; + border: 1px solid #e2e8f0; +} + +.form-control:focus, .form-select:focus { + box-shadow: 0 0 0 3px rgba(59, 130, 246, 0.1); + border-color: #3b82f6; +} + +.btn { + border-radius: 8px; + padding: 0.625rem 1.25rem; + font-weight: 500; +} + +.btn-primary { + background-color: var(--primary); + border-color: var(--primary); +} + +.btn-primary:hover { + background-color: #2563eb; + border-color: #2563eb; +} + +/* Mobile adjustments */ +@media (max-width: 768px) { + .stat-card { + padding: 1rem; + } + .hero-gradient { + padding: 2rem 1rem; + } +} \ No newline at end of file