From 41eda0e7ac90b39ad72297d47c0fd64d538dd66e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=D0=98=D0=B3=D0=BE=D1=80=D1=8C=20=D0=9D=D0=B0=D0=B4=D0=B5?=
 =?UTF-8?q?=D0=B8=D0=BD?= <igor_26reg@mail.ru>
Date: Tue, 9 Dec 2025 13:11:28 +0300
Subject: [PATCH] =?UTF-8?q?fix:=20=D0=B8=D1=81=D0=BF=D1=80=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=BB=D0=B5=D0=BD=D0=B8=D0=B5=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B7=D0=B0=D1=8F=D0=B2=D0=BE=D0=BA=20-?=
 =?UTF-8?q?=20=D0=B4=D0=BE=D0=B1=D0=B0=D0=B2=D0=BB=D0=B5=D0=BD=D0=BE=20?=
 =?UTF-8?q?=D0=BE=D0=B1=D1=8F=D0=B7=D0=B0=D1=82=D0=B5=D0=BB=D1=8C=D0=BD?=
 =?UTF-8?q?=D0=BE=D0=B5=20=D0=BF=D0=BE=D0=BB=D0=B5=20department?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- Сделано поле 'items' необязательным в ProcurementRequestCreateSerializer
- Добавлено поле 'department' в форму создания заявки (dashboard и request_list)
- Обновлен JavaScript для передачи department в API
- Добавлен список departments в контекст dashboard view
- Теперь можно создать заявку без позиций (items), добавить их потом
- Все 72 теста проходят успешно
---
 backend/procurement/serializers.py              |  6 +++---
 backend/procurement/views_frontend.py           |  1 +
 backend/templates/procurement/dashboard.html    | 11 +++++++++++
 backend/templates/procurement/request_list.html | 11 +++++++++++
 4 files changed, 26 insertions(+), 3 deletions(-)

diff --git a/backend/procurement/serializers.py b/backend/procurement/serializers.py
index b60194b1..c6ef9420 100644
--- a/backend/procurement/serializers.py
+++ b/backend/procurement/serializers.py
@@ -231,7 +231,7 @@ class ProcurementRequestDetailSerializer(serializers.ModelSerializer):
 class ProcurementRequestCreateSerializer(serializers.ModelSerializer):
     """Сериализатор для создания заявки с позициями."""
 
-    items = ProcurementItemCreateSerializer(many=True)
+    items = ProcurementItemCreateSerializer(many=True, required=False)
 
     class Meta:
         model = ProcurementRequest
@@ -251,7 +251,7 @@ class ProcurementRequestCreateSerializer(serializers.ModelSerializer):
 
     def create(self, validated_data):
         """Создать заявку с позициями."""
-        items_data = validated_data.pop('items')
+        items_data = validated_data.pop('items', [])
         request = self.context['request']
 
         # Создаем заявку
@@ -260,7 +260,7 @@ class ProcurementRequestCreateSerializer(serializers.ModelSerializer):
             **validated_data
         )
 
-        # Создаем позиции
+        # Создаем позиции (если они переданы)
         for item_data in items_data:
             ProcurementItem.objects.create(
                 request=procurement_request,
diff --git a/backend/procurement/views_frontend.py b/backend/procurement/views_frontend.py
index 7dfa488b..04bdff38 100644
--- a/backend/procurement/views_frontend.py
+++ b/backend/procurement/views_frontend.py
@@ -67,6 +67,7 @@ def dashboard(request):
         'budget': budget,
         'recent_requests': recent_requests,
         'can_approve': can_approve,
+        'departments': Department.objects.all().order_by('name'),
     }
     return render(request, 'procurement/dashboard.html', context)
 
diff --git a/backend/templates/procurement/dashboard.html b/backend/templates/procurement/dashboard.html
index 45337ac4..251f75d0 100644
--- a/backend/templates/procurement/dashboard.html
+++ b/backend/templates/procurement/dashboard.html
@@ -242,6 +242,16 @@
                       placeholder="Опишите необходимость закупки..." maxlength="2000"></textarea>
           </div>
           
+          <div class="col-12">
+            <label class="form-label">Отдел <span class="text-danger">*</span></label>
+            <select name="department" class="form-select" required>
+              <option value="">Выберите отдел...</option>
+              {% for dept in departments %}
+                <option value="{{ dept.id }}">{{ dept.name }}</option>
+              {% endfor %}
+            </select>
+          </div>
+          
           <div class="col-md-6">
             <label class="form-label">Срочность <span class="text-danger">*</span></label>
             <select name="urgency" class="form-select" required>
@@ -303,6 +313,7 @@
       const data = {
         title: formData.get('title'),
         description: formData.get('description') || '',
+        department: formData.get('department'),
         urgency: formData.get('urgency'),
         estimated_cost: formData.get('estimated_cost') || null,
         desired_date: formData.get('desired_date') || null,
diff --git a/backend/templates/procurement/request_list.html b/backend/templates/procurement/request_list.html
index bbd7c1fe..a71d3a50 100644
--- a/backend/templates/procurement/request_list.html
+++ b/backend/templates/procurement/request_list.html
@@ -173,6 +173,16 @@
                       placeholder="Опишите необходимость закупки..." maxlength="2000"></textarea>
           </div>
           
+          <div class="col-12">
+            <label class="form-label">Отдел <span class="text-danger">*</span></label>
+            <select name="department" class="form-select" required>
+              <option value="">Выберите отдел...</option>
+              {% for dept in departments %}
+                <option value="{{ dept.id }}">{{ dept.name }}</option>
+              {% endfor %}
+            </select>
+          </div>
+          
           <div class="col-md-6">
             <label class="form-label">Срочность <span class="text-danger">*</span></label>
             <select name="urgency" class="form-select" required>
@@ -234,6 +244,7 @@
       const data = {
         title: formData.get('title'),
         description: formData.get('description') || '',
+        department: formData.get('department'),
         urgency: formData.get('urgency'),
         estimated_cost: formData.get('estimated_cost') || null,
         desired_date: formData.get('desired_date') || null,