-
Выбор объекта:
-
Наименование:
-
Классификация здания:
-
Вид строительства:
+
Специализация проекта {{ form.specialization.errors.as_text }}
+
-
+
-
+ {{ form.specialization }}
-
+
- {{ form_realty.building_classification }}
+
- {{ form_realty.construction_type }}
+
-
-
Местоположение:
+
+
Бюджет {{ form.budget.errors.as_text }}
+
-
+
+
+
+ {{ form.currency }}
+
- {{ form_realty.country }}
+ {{ form.term_type }}
+
+
+
+
+
или по договоренности
+
+
+
+
+
Сделать для исполнителей обязательным для заполнения поля цена и срок
+
+
+
Способ оплаты {{ form.deal_type.errors.as_text }}
+
+
+
+
+
+
+ Безопасная сделка (с резервированием бюджета)
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro vel suscipit eaque quidem voluptate aperiam enim aut libero, excepturi architecto maxime, placeat maiores, odio itaque, ex consectetur dignissimos dicta officia
+
+
+
+
+
+
+
+ Прямая оплата Исполнителю на его кошелек/счет
+
+
+
+ Lorem ipsum dolor sit amet, consectetur adipisicing elit. Porro vel suscipit eaque quidem voluptate aperiam enim aut libero, excepturi architecto maxime, placeat maiores, odio itaque, ex consectetur dignissimos dicta officia
+
+
+
+
+
+
+
+
+
+
- {{ form_realty.city }}
+
Расширенный поиск
+
-
-
-
Требуется допуск СРО
+
-
-
-
-
Сохранить
+
+
+
Выбор объекта
{{ form.realty.errors.as_text }}
+
Наименование
{{ realty_form.name.errors.as_text }}
+
Классификация здания
{{ realty_form.building_classification.errors.as_text }}
+
Вид строительства
{{ realty_form.construction_type.errors.as_text }}
+
+
+
+{# #}
+
+ {{ form.realty }}
+
+
+
+
+
+ {{ realty_form.building_classification }}
+
+
+ {{ realty_form.construction_type }}
+
+
+
+
+{#
#}
+{# {{ realty_form.country }}#}
+{#
#}
+{#
#}
+{# {{ realty_form.city }}#}
+{#
#}
+
+
+
Требуется допуск СРО
+
+
+
+
+
+
+
+
+
+
-
-
+
{% include 'partials/footer.html' %}
diff --git a/projects/views.py b/projects/views.py
index 2c875d4..da18efc 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -17,10 +17,10 @@ from .forms import (
ContractorProjectAnswerForm,
CustomerProjectCreateForm,
PortfolioForm,
- ProjectDeleteForm,
- ProjectEditForm,
- ProjectRestoreForm,
- ProjectTrashForm,
+ CustomerProjectDeleteForm,
+ CustomerProjectEditForm,
+ CustomerProjectRestoreForm,
+ CustomerProjectTrashForm,
RealtyForm,
)
@@ -63,14 +63,16 @@ from .forms import (
class CustomerProjectCreateView(BaseMixin, View):
form_class = CustomerProjectCreateForm
+ realty_form = RealtyForm
template_name = 'customer_project_create.html'
def get(self, request, *args, **kwargs):
if request.user.is_authenticated() and request.user.is_customer():
form = self.form_class(request=request)
+ realty_form = self.realty_form(request=request)
context = self.get_context_data(**_.merge({}, request.GET, kwargs))
- context.update({'form': form})
+ context.update({'form': form, 'realty_form': realty_form})
return render(request, self.template_name, context)
else:
@@ -78,7 +80,8 @@ class CustomerProjectCreateView(BaseMixin, View):
def post(self, request, *args, **kwargs):
if request.user.is_authenticated() and request.user.is_customer():
- form = self.form_class(_.merge({}, request.POST, kwargs), request=request)
+ form = self.form_class(request.POST, request=request)
+ realty_form = None
if form.is_valid():
project = form.save(commit=False)
@@ -86,15 +89,47 @@ class CustomerProjectCreateView(BaseMixin, View):
project.save()
form.save_m2m()
- messages.info(request, 'Проект успешно создан')
- redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
- return redirect(redirect_to)
- else:
- context = self.get_context_data(**kwargs)
- context.update({'form': form})
+ realty = form.cleaned_data.get('realty')
- messages.info(request, 'Произошла ошибка:
{msg}'.format(msg=pformat(form.errors)))
- return render(request, self.template_name, context)
+ if realty:
+ realty_form = self.realty_form(request.POST, instance=realty, request=request) # Modify an existing realty
+
+ if realty_form.is_valid():
+ realty_form.save()
+
+ messages.info(request, 'Проект успешно создан')
+ redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
+ return redirect(redirect_to)
+ else:
+ realty_form = self.realty_form(request.POST, request=request) # Create a new realty
+
+ if realty_form.is_valid():
+ realty = realty_form.save(commit=False)
+ realty.user = request.user
+ realty.save()
+ realty_form.save_m2m()
+
+ messages.info(request, 'Проект успешно создан')
+ redirect_to = reverse('projects:detail', kwargs={'pk': project.pk})
+ return redirect(redirect_to)
+
+ context = self.get_context_data(**kwargs)
+
+ if form.errors:
+ messages.info(request, (
+ '
Произошла ошибка (form)
'
+ '
{form}'
+ ).format(form=pformat(form.errors)))
+
+
+ if realty_form and realty_form.errors:
+ messages.info(request, (
+ '
Произошла ошибка (realty_form)
'
+ '
{realty_form}'
+ ).format(realty_form=pformat(realty_form.errors)))
+
+ context.update({'form': form, 'realty_form': realty_form})
+ return render(request, self.template_name, context)
else:
return HttpResponseForbidden('403 Forbidden')
@@ -126,7 +161,7 @@ class ProjectView(BaseMixin, View):
class CustomerProjectEditView(BaseMixin, View):
- form_class = ProjectEditForm
+ form_class = CustomerProjectEditForm
template_name = 'customer_project_edit_test.html' # 'customer_project_edit.html'
def get(self, req, *args, **kwargs):
@@ -185,7 +220,7 @@ class ContractorProjectAnswerView(BaseMixin, View):
class CustomerProjectTrashView(View):
- form_class = ProjectTrashForm
+ form_class = CustomerProjectTrashForm
def post(self, req, *args, **kwargs):
if req.user.is_authenticated():
@@ -207,7 +242,7 @@ class CustomerProjectTrashView(View):
class CustomerProjectRestoreView(View):
- form_class = ProjectRestoreForm
+ form_class = CustomerProjectRestoreForm
def post(self, req, *args, **kwargs):
if req.user.is_authenticated():
@@ -229,7 +264,7 @@ class CustomerProjectRestoreView(View):
class CustomerProjectDeleteView(View):
- form_class = ProjectDeleteForm
+ form_class = CustomerProjectDeleteForm
def post(self, req, *args, **kwargs):
if req.user.is_authenticated():