diff --git a/archilance/management/commands/generate_users.py b/archilance/management/commands/generate_users.py index 5940f83..90ae119 100644 --- a/archilance/management/commands/generate_users.py +++ b/archilance/management/commands/generate_users.py @@ -86,6 +86,7 @@ class Command(BaseCommand): email='%s@example.com' % username, is_active=True, contractor_status=_.sample(User.STATUSES)[0], + cro=_.sample((True, False)), ) users = _.times(create_user, 500) diff --git a/projects/models.py b/projects/models.py index 4e3229a..25b26d7 100644 --- a/projects/models.py +++ b/projects/models.py @@ -50,7 +50,7 @@ class Realty(models.Model): construction_type = models.ForeignKey(ConstructionType, related_name='realties') location = TreeForeignKey('common.Location', related_name='realties', null=True, blank=True) name = models.CharField(max_length=255) - user = models.ForeignKey(User, related_name='realties') + user = models.ForeignKey(User, related_name='realties') # Do we actually need this field? def __str__(self): return self.name diff --git a/projects/templates/project_detail.html b/projects/templates/project_detail.html index 99cce29..dfacf97 100644 --- a/projects/templates/project_detail.html +++ b/projects/templates/project_detail.html @@ -163,153 +163,156 @@ - {% if request.user.is_contractor and request.user.contractor_answers.exists %} - - - - - - {% with answer=request.user.contractor_answers.first %} -
-
-
- -
- {% if answer.author.avatar %} - execitor-image - {% else %} - execitor-image - {% endif %} -
- -

- {{ answer.author.get_full_name }} [{{ answer.author.username }}] -

-

На сайте {{ answer.author.created }}

- - {% if answer.author|class_name == 'User' %} - {% if answer.author.contractor_status == 'free' %} -
Свободен
- {% endif %} - {% endif %} -
-
- - -
-
-

Есть допуск СРО

-
-
-
-

- Цена: - {{ answer.budget|intcomma }} - -

-

- Срок: {{ answer.term }} {{ answer.get_term_type_display|decap }} -

-

Опубликован: {{ answer.created }}

-
-
- - Кандидат - - - предложить проект - - - отказ - -
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-

- Иванов Петр Иванович -

- - 13.01.2016 / 21:05 - -
- - - - - -
-

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. -

-
-
-
-
-

- Иванов Петр Иванович -

- - 13.01.2016 / 21:05 - -

- Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio. -

- - Ответить - -
-
-
-
-
- {% endwith %} - - - - - - {% elif request.user.is_contractor %} +{# {% if request.user.is_contractor and request.user.contractor_answers.exists and request.user.contractor_answers.first in project.answers.all %}#} +{# #} +{# #} +{# #} +{# #} +{# #} +{# {% with answer=request.user.contractor_answers.first %}#} +{#
#} +{#
#} +{#
#} +{# #} +{#
#} +{# {% if answer.author.avatar %}#} +{# execitor-image#} +{# {% else %}#} +{# execitor-image#} +{# {% endif %}#} +{#
#} +{# #} +{#

#} +{# {{ answer.author.get_full_name }} [{{ answer.author.username }}]#} +{#

#} +{#

На сайте {{ answer.author.created }}

#} +{# #} +{# {% if answer.author|class_name == 'User' %}#} +{# {% if answer.author.contractor_status == 'free' %}#} +{#
Свободен
#} +{# {% endif %}#} +{# {% endif %}#} +{#
#} +{#
#} +{# #} +{# #} +{# {% if answer.author|class_name == 'User' %}#} +{#
#} +{#
#} +{#

Есть допуск СРО

#} +{#
#} +{# {% else %}#} +{# ...#} +{# {% endif %}#} +{#
#} +{#
#} +{#

#} +{# Цена:#} +{# {{ answer.budget|intcomma }}#} +{# #} +{#

#} +{#

#} +{# Срок: {{ answer.term }} {{ answer.get_term_type_display|decap }}#} +{#

#} +{#

Опубликован: {{ answer.created }}

#} +{#
#} +{#
#} +{# #} +{# Кандидат#} +{# #} +{# #} +{# предложить проект#} +{# #} +{# #} +{# отказ#} +{# #} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{#

#} +{# Иванов Петр Иванович #} +{#

#} +{# #} +{# 13.01.2016 / 21:05#} +{# #} +{#
#} +{# #} +{# #} +{# #} +{# #} +{# #} +{#
#} +{#

#} +{# Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.#} +{#

#} +{#
#} +{#
#} +{#
#} +{#
#} +{#

#} +{# Иванов Петр Иванович #} +{#

#} +{# #} +{# 13.01.2016 / 21:05#} +{# #} +{#

#} +{# Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo. Proin sodales pulvinar tempor. Cum sociis natoque penatibus et magnis dis parturient montes, nascetur ridiculus mus. Nam fermentum, nulla luctus pharetra vulputate, felis tellus mollis orci, sed rhoncus sapien nunc eget odio.#} +{#

#} +{# #} +{# Ответить#} +{# #} +{#
#} +{#
#} +{#
#} +{#
#} +{#
#} +{# {% endwith %}#} + + + +{# {% elif request.user.is_contractor and not request.user.contractor_answers.exists %}#} + {% if request.user.is_contractor and not request.user.contractor_answers.exists %} diff --git a/projects/views.py b/projects/views.py index d7cecf1..f3f5f7d 100644 --- a/projects/views.py +++ b/projects/views.py @@ -44,6 +44,8 @@ class ProjectDetailWithContractorAnswerView(BaseMixin, View): project = get_object_or_404(Project, pk=kwargs.get('pk')) context.update({'project': project}) + # context.update({'tmp_answer': ...}) # Tmp + if request.user.is_authenticated() and request.user.is_contractor(): form = self.form_class(request=request) context.update({'form': form})