From 2e983bc3caf21316beb6b2d796e8b9178bc85a12 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Tue, 21 Jun 2016 21:03:52 +0300 Subject: [PATCH] #ARC-12 Extended characteristics --- common/templatetags/common_tags.py | 7 + projects/forms.py | 53 +-- .../migrations/0033_auto_20160621_1057.py | 21 + projects/models.py | 10 +- .../templates/customer_project_create.html | 367 ++++++++++-------- projects/views.py | 71 +++- 6 files changed, 331 insertions(+), 198 deletions(-) create mode 100644 projects/migrations/0033_auto_20160621_1057.py diff --git a/common/templatetags/common_tags.py b/common/templatetags/common_tags.py index 925aafe..b79f329 100644 --- a/common/templatetags/common_tags.py +++ b/common/templatetags/common_tags.py @@ -15,3 +15,10 @@ def inspect2(context, obj): return { 'obj': pformat(dir(obj)), } + +@register.simple_tag +def interact(**kwargs): + import code; code.interact(local=dict(kwargs, **dict(globals(), **locals()))) + + +# import code; code.interact(local=dict(globals(), **locals())) diff --git a/projects/forms.py b/projects/forms.py index e807541..a750a35 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -1,6 +1,5 @@ from django import forms from django.db.models import Q -from django.forms import ModelForm, HiddenInput, Form, Select from django.forms.models import inlineformset_factory from mptt.forms import TreeNodeChoiceField @@ -11,13 +10,13 @@ from users.models import User # RealtyFormSet = inlineformset_factory(Project, Realty) -class ProjectsForm(Form): +class ProjectsForm(forms.Form): name = forms.CharField(max_length=255) -class CustomerProjectCreateForm(ModelForm): +class CustomerProjectCreateForm(forms.ModelForm): specialization = TreeNodeChoiceField(queryset=Specialization.objects.exclude(id=1)) - + class Meta: model = Project @@ -29,49 +28,59 @@ class CustomerProjectCreateForm(ModelForm): 'deal_type', 'name', 'price_and_term_required', + 'realty', 'specialization', 'term_type', 'text', 'work_type', ) - + widgets = { - 'specialization': Select(attrs={'class':'selectpicker'}), - 'currency': Select(attrs={'class':'selectpicker2 valul'}), - 'term_type': Select(attrs={'class':'selectpicker'}), + 'currency': forms.Select(attrs={'class':'selectpicker2 valul'}), + 'realty': forms.Select(attrs={'class':'selectpicker'}), + 'specialization': forms.Select(attrs={'class':'selectpicker'}), + 'term_type': forms.Select(attrs={'class':'selectpicker'}), } def __init__(self, *args, **kwargs): self.request = kwargs.pop('request') super().__init__(*args, **kwargs) + + self.fields['realty'].empty_label = 'Создать новый' -class RealtyForm(ModelForm): +class RealtyForm(forms.ModelForm): class Meta: model = Realty fields = ( 'building_classification', 'construction_type', + 'location', 'name', ) - + widgets = { - 'construction_type': Select(attrs={'class':'selectpicker'}), - 'building_classification': Select(attrs={'class':'selectpicker'}), + 'construction_type': forms.Select(attrs={'class':'selectpicker'}), + 'building_classification': forms.Select(attrs={'class':'selectpicker'}), } + + def __init__(self, *args, **kwargs): + self.request = kwargs.pop('request') + super().__init__(*args, **kwargs) + -class Realty1Form(Form): +class Realty1Form(forms.Form): pass -class PortfolioForm(ModelForm): +class PortfolioForm(forms.ModelForm): class Meta: model = Portfolio fields = '__all__' -class ContractorProjectAnswerForm(ModelForm): +class ContractorProjectAnswerForm(forms.ModelForm): # def __init__(self, *args, **kwargs): # # import code; code.interact(local=dict(globals(), **locals())) # self.project_id = kwargs.pop('project_id') @@ -90,12 +99,12 @@ class ContractorProjectAnswerForm(ModelForm): ) widgets = { - 'currency': Select(attrs={'class':'selectpicker'}), - 'term_type': Select(attrs={'class':'selectpicker'}), + 'currency': forms.Select(attrs={'class':'selectpicker'}), + 'term_type': forms.Select(attrs={'class':'selectpicker'}), } -class StageForm(ModelForm): +class StageForm(forms.ModelForm): class Meta: model = Stage @@ -112,7 +121,7 @@ class StageForm(ModelForm): PortfolioPhotoFormSet = inlineformset_factory(Portfolio, PortfolioPhoto, fields=('img',)) -class ProjectEditForm(forms.ModelForm): +class CustomerProjectEditForm(forms.ModelForm): pk = forms.ModelChoiceField(queryset=Project.objects.none()) class Meta: @@ -126,7 +135,7 @@ class ProjectEditForm(forms.ModelForm): self.fields['pk'].queryset = self.req.user.projects.filter(state='active') -class ProjectTrashForm(Form): +class CustomerProjectTrashForm(forms.Form): pk = forms.ModelChoiceField(queryset=Project.objects.none()) def __init__(self, *args, **kwargs): @@ -136,7 +145,7 @@ class ProjectTrashForm(Form): self.fields['pk'].queryset = self.req.user.projects.filter(state='active') -class ProjectRestoreForm(Form): +class CustomerProjectRestoreForm(forms.Form): pk = forms.ModelChoiceField(queryset=Project.objects.none()) def __init__(self, *args, **kwargs): @@ -146,7 +155,7 @@ class ProjectRestoreForm(Form): self.fields['pk'].queryset = self.req.user.projects.filter(state='trashed') -class ProjectDeleteForm(Form): +class CustomerProjectDeleteForm(forms.Form): pk = forms.ModelChoiceField(queryset=Project.objects.none()) def __init__(self, *args, **kwargs): diff --git a/projects/migrations/0033_auto_20160621_1057.py b/projects/migrations/0033_auto_20160621_1057.py new file mode 100644 index 0000000..f78937f --- /dev/null +++ b/projects/migrations/0033_auto_20160621_1057.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-21 07:57 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0032_auto_20160615_1610'), + ] + + operations = [ + migrations.AlterField( + model_name='project', + name='realty', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='projects', to='projects.Realty'), + ), + ] diff --git a/projects/models.py b/projects/models.py index d0be358..302f4de 100644 --- a/projects/models.py +++ b/projects/models.py @@ -80,8 +80,8 @@ class Project(models.Model): currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES) customer = models.ForeignKey(User, related_name='projects') name = models.CharField(max_length=255) - price_and_term_required = models.BooleanField(default=False, blank=True) - realty = models.ForeignKey(Realty, null=True, related_name='projects') + price_and_term_required = models.BooleanField(default=False) + realty = models.ForeignKey(Realty, blank=True, null=True, related_name='projects') deal_type = models.CharField(max_length=20, default='secure_deal', choices=DEAL_TYPES) specialization = models.ForeignKey(Specialization, related_name='projects') term = models.IntegerField(default=0) @@ -96,11 +96,9 @@ class Project(models.Model): class Meta: verbose_name = 'Проект' verbose_name_plural = 'Проекты' - + def secure_deal(self): - if self.deal_type == 'secure_deal': - return True - return False + return self.deal_type == 'secure_deal' class ProjectFile(models.Model): diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index 172b172..76fcaa6 100644 --- a/projects/templates/customer_project_create.html +++ b/projects/templates/customer_project_create.html @@ -1,5 +1,7 @@ {% extends 'partials/base.html' %} +{% load common_tags %} + {% block content %} {% include 'partials/header.html' %} @@ -8,189 +10,250 @@

Новый заказ

- -
+ + {% csrf_token %} - {{ form.errors }} - {{ form_realty.errors }} -
-
-

Формирование заказа

-
-

Название заказа

- -
-
-

Подробно опишите задание

- -
-
-
-
-

Дополнительно

-
-
-
- -

+ добавить файл (до 100 файлов)

-
-
    -
  • - Архитерурное 2.jpg - 7мб -
    -
    • - -
-
-

Тип работы:

-
-
- -

Проектирование

+ +
+
+

Формирование заказа

+ + {% if form.non_field_errors %} +
{{ form.non_field_errors }}
+ {% endif %} + +
+

Название заказа {{ form.name.errors.as_text }}

+
-
- -

Техническое сопровождение

+ +
+

Подробно опишите задание {{ form.text.errors.as_text }}

+
-
- + Добавить раздел -
-
-
-
-
-
-
Специализация проекта:
-
-
-
-
-
-
- {{ form.specialization }} -
-
- -
-
- -
-
- -
-
-
-
Бюджет
-
-
-
-
- - {{ form.currency }} -
-
- {{ form.term_type }} -
-
- -

или по договоренности

-
-
-
- -

Сделать для исполнителей обязательным для заполнения поля цена и срок

-
-
-
Способ оплаты
-
-
-
- -

- Безопасная сделка (с резервированием бюджета) -

-

- 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 -

+
+
+ +

+ добавить файл (до 100 файлов)

+
+
    +
  • + Архитерурное 2.jpg + 7мб +
    +
    • + +
-
-
-
-

Расширенный поиск

- + +

Тип работы {{ form.work_type.errors.as_text }}

+
+ {% for id, name in form.work_type.field.choices %} +
+ + +

{{ name }}

+
+ {% endfor %}
-
-
+
+ + Добавить раздел
-
+
+
+
-
Выбор объекта:
-
Наименование:
-
Классификация здания:
-
Вид строительства:
+
Специализация проекта {{ 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():