mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'setup' of https://bitbucket.org/PekopT/archilance into setup

Browse Source
remotes/origin/setup
Mukhtar 10 years ago
parent 20b8d13e50 51b5692e15
commit 45b607b256
6 changed files with 192 additions and 149 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      archilance/management/commands/generate_users.py
  2. 4
      projects/models.py
  3. 261
      projects/templates/project_detail.html
  4. 4
      projects/urls.py
  5. 31
      projects/views.py
  6. 12
      templates/trash/contractor_project-detail.html

1
archilance/management/commands/generate_users.py
Unescape View File

@ -86,6 +86,7 @@ class Command(BaseCommand):
email='%s@example.com' % username, email='%s@example.com' % username,
is_active=True, is_active=True,
contractor_status=_.sample(User.STATUSES)[0], contractor_status=_.sample(User.STATUSES)[0],
cro=_.sample((True, False)),
) )
users = _.times(create_user, 500) users = _.times(create_user, 500)

4
projects/models.py
Unescape View File

@ -50,7 +50,7 @@ class Realty(models.Model):
construction_type = models.ForeignKey(ConstructionType, related_name='realties') construction_type = models.ForeignKey(ConstructionType, related_name='realties')
location = TreeForeignKey('common.Location', related_name='realties', null=True, blank=True) location = TreeForeignKey('common.Location', related_name='realties', null=True, blank=True)
name = models.CharField(max_length=255) 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): def __str__(self):
return self.name return self.name
@ -133,7 +133,7 @@ class Answer(models.Model):
author = GenericForeignKey('content_type', 'object_id') author = GenericForeignKey('content_type', 'object_id')
def __str__(self): def __str__(self):
return self.text return "{author}'s answer ({id})".format(author=type(self.author).__name__, id=self.pk)
class Meta: class Meta:
verbose_name = 'Отклик на проект' verbose_name = 'Отклик на проект'

261
projects/templates/project_detail.html
Unescape View File

@ -157,22 +157,16 @@
{% if request.user.is_contractor %}
{% if answer %}
{% if request.user.is_contractor and request.user.contractor_answers.exists %}
{% with answer=request.user.contractor_answers.first %}
<div class="candidateBlock disTab"> <div class="candidateBlock disTab">
<div class="candidate"> <div class="candidate can-new">
<div class="col-lg-4"> <div class="col-lg-4">
<a href="#" class="aLinkExe"> <a href="#" class="aLinkExe">
<div class="imgExecutor"> <div class="imgExecutor">
@ -183,9 +177,15 @@
{% endif %} {% endif %}
</div> </div>
</a> </a>
<p class="nameExecutor"> <p class="nameExecutor">
<a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a> {% if answer.author|class_name == 'User' %}
<a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>
{% elif answer.author|class_name == 'Team' %}
<a href="#">{{ answer.author.name }}</a>
{% endif %}
</p> </p>
<p class="navv2">На сайте {{ answer.author.created }}</p> <p class="navv2">На сайте {{ answer.author.created }}</p>
{% if answer.author|class_name == 'User' %} {% if answer.author|class_name == 'User' %}
@ -207,10 +207,21 @@
</li> </li>
</ul> </ul>
<div class="sroUser sroExecutor"> {% if answer.author|class_name == 'User' %}
<div class="iconSRO"></div> {% if answer.author.cro %}
<p>Есть допуск СРО</p> <div class="sroUser sroExecutor">
</div> <div class="iconSRO"></div>
<p>Есть допуск СРО</p>
</div>
{% endif %}
{% elif answer.author|class_name == 'Team' %}
{# {% if any of these motherfuckers "answer.author.contractors.all" got a cro, then... %}#}
<div class="sroUser sroExecutor">
<div class="iconSRO"></div>
<p>Есть допуск СРО</p>
</div>
{# {% endif %}#}
{% endif %}
</div> </div>
<div class="col-lg-2 listCens"> <div class="col-lg-2 listCens">
<p> <p>
@ -224,46 +235,31 @@
<p>Опубликован: {{ answer.created }}</p> <p>Опубликован: {{ answer.created }}</p>
</div> </div>
<div class="col-lg-3 retts"> <div class="col-lg-3 retts">
<a href="{% url 'projects:add-candidate' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink1"> <a href="#" onclick="return false" class="candLink candLink3">
Кандидат
</a>
<a href="{% url 'projects:offer-order' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink2">
предложить проект
</a>
<a href="javascript:void(0)" class="candLink candLink3">
отказ отказ
</a> </a>
</div> </div>
<div class="gallMini disTab"> <div class="gallMini disTab">
<div class="col-lg-3"> {% for portf in answer.portfolios.all %}
<div class="insetCol box-sizing disTab"> <div class="col-lg-3">
<div class="imgGal"> <div class="insetCol box-sizing disTab">
<div class="imgFigure"></div> <div class="imgGal" style="background: url('{{ portf.photos.first.img.url }}') no-repeat center">
</div> <div class="imgFigure"></div>
</div> </div>
</div>
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
<div class="imgGal">
<div class="imgFigure"></div>
</div> </div>
</div> </div>
</div> {% endfor %}
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
<div class="imgGal">
<div class="imgFigure"></div>
</div>
</div>
</div>
<div class="col-lg-3">
<div class="insetCol box-sizing disTab">
<div class="imgGal">
<div class="imgFigure"></div>
</div>
</div>
</div>
</div> </div>
<div class="commBlock44 disTab"> <div class="commBlock44 disTab">
<div class="comm44 disTab"> <div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
@ -285,6 +281,10 @@
</p> </p>
</div> </div>
</div> </div>
<div class="comm44 disTab"> <div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">
<p class="nameComm nameCommAct"> <p class="nameComm nameCommAct">
@ -302,113 +302,107 @@
</div> </div>
</div> </div>
</div> </div>
</div>
</div>
{% endwith %}
{% elif request.user.is_contractor %}
</div>
</div>
{% else %}
<form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate>
{% csrf_token %}
<input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
<form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate> <div class="polsF1 disTab">
{% csrf_token %} <div class="col-lg-3">
<input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Стоимость <span style="color: red">{{ form.budget.errors.as_text }}</span></p>
<input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
</div>
</div>
<div class="polsF1 disTab"> <div class="col-lg-3">
<div class="col-lg-3"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<div class="textAreaBlock2 text-nn box-sizing disTab"> {{ form.currency }}
<p>Стоимость <span style="color: red">{{ form.budget.errors.as_text }}</span></p> </div>
<input type="text" class="box-sizing" name="{{ form.budget.html_name }}" value="{{ form.budget.value }}">
</div> </div>
</div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
{{ form.currency }} <p>Срок <span style="color: red">{{ form.term.errors.as_text }}</span></p>
<input type="text" class="box-sizing" name="{{ form.term.html_name }}" value="{{ form.term.value }}">
</div>
</div> </div>
</div>
<div class="col-lg-3"> <div class="col-lg-3">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Срок <span style="color: red">{{ form.term.errors.as_text }}</span></p> {{ form.term_type }}
<input type="text" class="box-sizing" name="{{ form.term.html_name }}" value="{{ form.term.value }}"> </div>
</div> </div>
</div> </div>
<div class="col-lg-3"> <div class="polsF1 disTab searchF1">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="col-lg-9">
{{ form.term_type }} <div class="textAreaBlock2 text-nn box-sizing disTab">
<p>Текст <span style="color: red">{{ form.text.errors.as_text }}</span></p>
<textarea name="{{ form.text.html_name }}" id="text-new">{{ form.text.value }}</textarea>
</div>
</div> </div>
<div class="col-lg-3"></div>
</div> </div>
</div>
<div class="polsF1 disTab searchF1"> <div class="polsF1 disTab searchF1">
<div class="col-lg-9"> <div class="col-lg-9">
<div class="textAreaBlock2 text-nn box-sizing disTab"> <p>Портфолио <span style="color: red">{{ form.portfolios.errors.as_text }}</span></p>
<p>Текст <span style="color: red">{{ form.text.errors.as_text }}</span></p>
<textarea name="{{ form.text.html_name }}" id="text-new">{{ form.text.value }}</textarea> <ul>
{% for p in request.user.portfolios.all %}
<li>
<input
type="checkbox"
name="{{ form.portfolios.html_name }}"
value="{{ p.pk }}"
{% if p.pk|str in form.portfolios.value %}checked{% endif %}>
{{ p.name }}
</li>
{% endfor %}
</ul>
</div> </div>
</div> </div>
<div class="col-lg-3"></div>
</div>
<div class="polsF1 disTab searchF1">
<div class="col-lg-9">
<p>Портфолио <span style="color: red">{{ form.portfolios.errors.as_text }}</span></p>
<ul> <div class="polsF1 disTab searchF1">
{% for p in request.user.portfolios.all %} <div class="col-lg-9">
<li> <div id="fileUploadContainer">
<input <div>
type="checkbox" <button type="button" id="fileUploadAddBtn">Добавить файл</button> Не более 10 файлов общим объемом до 500 Мб
name="{{ form.portfolios.html_name }}" </div>
value="{{ p.pk }}"
{% if p.pk|str in form.portfolios.value %}checked{% endif %}>
{{ p.name }}
</li>
{% endfor %}
</ul>
</div>
</div>
<div class="polsF1 disTab searchF1"> <ul class="list-new-new">
<div class="col-lg-9"> <li class="file-upload-widget" style="display: none">
<div id="fileUploadContainer"> <input type="file" name="new_files" class="file-upload-input" style="position: absolute; top: -1000px; left: -1000px">
<div> <span class="file-upload-label"></span>
<button type="button" id="fileUploadAddBtn">Добавить файл</button> Не более 10 файлов общим объемом до 500 Мб <a href="#" onclick="return false" class="file-upload-remove-btn">&times;</a>
</li>
</ul>
</div> </div>
<ul class="list-new-new">
<li class="file-upload-widget" style="display: none">
<input type="file" name="new_files" class="file-upload-input" style="position: absolute; top: -1000px; left: -1000px">
<span class="file-upload-label"></span>
<a href="#" onclick="return false" class="file-upload-remove-btn">&times;</a>
</li>
</ul>
</div> </div>
</div> </div>
</div>
<div class="polsF1 disTab searchF1"> <div class="polsF1 disTab searchF1">
<div class="col-lg-9"> <div class="col-lg-9">
{{ form.secure_deal_only }} Работаю только по безопасной сделке {{ form.secure_deal_only }} Работаю только по безопасной сделке
</div>
</div> </div>
</div>
<div class="polsF1 disTab searchF1"> <div class="polsF1 disTab searchF1">
<div class="col-lg-3"> <div class="col-lg-3">
<button type="submit">Опубликовать ответ</button> <button type="submit">Опубликовать ответ</button>
</div>
</div> </div>
</div>
<div class="polsF1 disTab searchF1"></div> <div class="polsF1 disTab searchF1"></div>
</form> </form>
{% endif %}
@ -416,6 +410,10 @@
{% elif request.user.is_customer %} {% elif request.user.is_customer %}
<div class="exBigBlock disTab"> <div class="exBigBlock disTab">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleEx">Исполнители</p> <p class="titleEx">Исполнители</p>
@ -446,6 +444,15 @@
</div> </div>
{% for answer_p in project.answers.all %} {% for answer_p in project.answers.all %}
<div class="candidateBlock disTab"> <div class="candidateBlock disTab">
<div class="candidate"> <div class="candidate">

4
projects/urls.py
Unescape View File

@ -4,6 +4,7 @@ from django.views.generic import TemplateView
from .views import ( from .views import (
add_candidate, add_candidate,
contractor_portfolio_create, contractor_portfolio_create,
ContractorPortfolioTrashView,
ContractorPortfolioUpdateView, ContractorPortfolioUpdateView,
CustomerProjectCreateView, CustomerProjectCreateView,
CustomerProjectDeleteView, CustomerProjectDeleteView,
@ -12,9 +13,8 @@ from .views import (
CustomerProjectTrashView, CustomerProjectTrashView,
OfferOrderView, OfferOrderView,
ProjectComparisonView, ProjectComparisonView,
ProjectFilterView,
ProjectDetailWithContractorAnswerView, ProjectDetailWithContractorAnswerView,
ContractorPortfolioTrashView, ProjectFilterView,
) )
app_name = 'projects' app_name = 'projects'

31
projects/views.py
Unescape View File

@ -17,10 +17,11 @@ import re
from .mixins import LastAccessMixin from .mixins import LastAccessMixin
from .models import Project, ProjectFile, Portfolio, PortfolioPhoto,Candidate, Answer, AnswerFile, Realty, Order from .models import Project, ProjectFile, Portfolio, PortfolioPhoto,Candidate, Answer, AnswerFile, Realty, Order
from archilance.mixins import BaseMixin from archilance.mixins import BaseMixin
from users.models import User from users.models import User, Team
from work_sell.models import Picture from work_sell.models import Picture
from .forms import ( from .forms import (
ContractorPortfolioTrashForm,
ContractorProjectAnswerForm, ContractorProjectAnswerForm,
CustomerProjectDeleteForm, CustomerProjectDeleteForm,
CustomerProjectEditForm, CustomerProjectEditForm,
@ -31,7 +32,6 @@ from .forms import (
ProjectFilterForm, ProjectFilterForm,
ProjectFilterRealtyForm, ProjectFilterRealtyForm,
RealtyForm, RealtyForm,
ContractorPortfolioTrashForm,
) )
@ -46,8 +46,31 @@ class ProjectDetailWithContractorAnswerView(BaseMixin, View):
context.update({'project': project}) context.update({'project': project})
if request.user.is_authenticated() and request.user.is_contractor(): if request.user.is_authenticated() and request.user.is_contractor():
form = self.form_class(request=request) project_answers = project.answers.all()
context.update({'form': form}) got_answer = None
contractor = request.user
answer = contractor.contractor_answers.first()
if answer and answer in project_answers:
got_answer = True
else:
team = None
answer = None
try: team = contractor.team
except Team.DoesNotExist: pass
if team:
answer = team.answers.first()
if answer and answer in project_answers:
got_answer = True
if got_answer:
context.update({'answer': answer})
else:
form = self.form_class(request=request)
context.update({'form': form})
return render(request, self.template_name, context) return render(request, self.template_name, context)

12
templates/trash/contractor_project-detail.html
Unescape View File

@ -231,6 +231,18 @@
отказ отказ
</a> </a>
</div> </div>
<div class="commBlock44 comm-new disTab"> <div class="commBlock44 comm-new disTab">
<div class="comm44 disTab"> <div class="comm44 disTab">
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">

Write Preview
Loading…
Cancel
Save