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

#ARC-14

Browse Source
remotes/origin/setup
ArturBaybulatov 10 years ago
parent ddc57455b4
commit 057178340e
3 changed files with 169 additions and 156 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. 319
      projects/templates/project_detail.html
  2. 4
      projects/urls.py
  3. 2
      projects/views.py

319
projects/templates/project_detail.html
Unescape View File

@ -164,158 +164,158 @@
{# {% if request.user.is_contractor and request.user.contractor_answers.exists and request.user.contractor_answers.first in project.answers.all %}#} {% if False and 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 %}#} {% with answer=request.user.contractor_answers.first %}
{# <div class="candidateBlock disTab">#} <div class="candidateBlock disTab">
{# <div class="candidate">#} <div class="candidate">
{# <div class="col-lg-4">#} <div class="col-lg-4">
{# <a href="#" class="aLinkExe">#} <a href="#" class="aLinkExe">
{# <div class="imgExecutor">#} <div class="imgExecutor">
{# {% if answer.author.avatar %}#} {% if answer.author.avatar %}
{# <img src="{{ answer.author.avatar.url }}" alt="execitor-image">#} <img src="{{ answer.author.avatar.url }}" alt="execitor-image">
{# {% else %}#} {% else %}
{# <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">#} <img src="{% static 'img/profile.jpg' %}" alt="execitor-image">
{# {% endif %}#} {% endif %}
{# </div>#} </div>
{# </a>#} </a>
{# <p class="nameExecutor">#} <p class="nameExecutor">
{# <a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>#} <a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>
{# </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' %}
{# {% if answer.author.contractor_status == 'free' %}#} {% if answer.author.contractor_status == 'free' %}
{# <div class="statusUser">Свободен</div><!-- ............. -->#} <div class="statusUser">Свободен</div><!-- ............. -->
{# {% endif %}#} {% endif %}
{# {% endif %}#} {% endif %}
{# </div>#} </div>
{# <div class="col-lg-3 retts">#} <div class="col-lg-3 retts">
{# <ul class="rettList restList2">#} <ul class="rettList restList2">
{# <li>Рейтинг: <span> 0</span></li>#} <li>Рейтинг: <span> 0</span></li>
{# <li>Безопасные сделки: <span> 0</span></li>#} <li>Безопасные сделки: <span> 0</span></li>
{# <li>#} <li>
{# <a href="javascript:void(0)">Отзывы: #} <a href="javascript:void(0)">Отзывы:
{# <span> + 0</span>#} <span> + 0</span>
{# <small> 0</small>#} <small> 0</small>
{# <mark> - 0</mark>#} <mark> - 0</mark>
{# </a>#} </a>
{# </li>#} </li>
{# </ul>#} </ul>
{# #}
{# {% if answer.author|class_name == 'User' %}#} {% if answer.author|class_name == 'User' %}
{# <div class="sroUser sroExecutor">#} <div class="sroUser sroExecutor">
{# <div class="iconSRO"></div>#} <div class="iconSRO"></div>
{# <p>Есть допуск СРО</p>#} <p>Есть допуск СРО</p>
{# </div>#} </div>
{# {% else %}#} {% else %}
{# ...#} ...
{# {% endif %}#} {% endif %}
{# </div>#} </div>
{# <div class="col-lg-2 listCens">#} <div class="col-lg-2 listCens">
{# <p>#} <p>
{# Цена:#} Цена:
{# <span>{{ answer.budget|intcomma }}</span>#} <span>{{ answer.budget|intcomma }}</span>
{# <i class="fa fa-rub"></i>#} <i class="fa fa-rub"></i>
{# </p>#} </p>
{# <p>#} <p>
{# Срок: <span>{{ answer.term }} {{ answer.get_term_type_display|decap }}</span>#} Срок: <span>{{ answer.term }} {{ answer.get_term_type_display|decap }}</span>
{# </p>#} </p>
{# <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="{% url 'projects:add-candidate' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink1">
{# Кандидат#} Кандидат
{# </a>#} </a>
{# <a href="{% url 'projects:offer-order' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink2">#} <a href="{% url 'projects:offer-order' answer_id=answer.pk project_id=project.pk %}" class="candLink candLink2">
{# предложить проект#} предложить проект
{# </a>#} </a>
{# <a href="javascript:void(0)" class="candLink candLink3">#} <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">#} <div class="col-lg-3">
{# <div class="insetCol box-sizing disTab">#} <div class="insetCol box-sizing disTab">
{# <div class="imgGal">#} <div class="imgGal">
{# <div class="imgFigure"></div>#} <div class="imgFigure"></div>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# <div class="col-lg-3">#} <div class="col-lg-3">
{# <div class="insetCol box-sizing disTab">#} <div class="insetCol box-sizing disTab">
{# <div class="imgGal">#} <div class="imgGal">
{# <div class="imgFigure"></div>#} <div class="imgFigure"></div>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# <div class="col-lg-3">#} <div class="col-lg-3">
{# <div class="insetCol box-sizing disTab">#} <div class="insetCol box-sizing disTab">
{# <div class="imgGal">#} <div class="imgGal">
{# <div class="imgFigure"></div>#} <div class="imgFigure"></div>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# <div class="col-lg-3">#} <div class="col-lg-3">
{# <div class="insetCol box-sizing disTab">#} <div class="insetCol box-sizing disTab">
{# <div class="imgGal">#} <div class="imgGal">
{# <div class="imgFigure"></div>#} <div class="imgFigure"></div>
{# </div>#} </div>
{# </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">
{# <p class="nameComm">#} <p class="nameComm">
{# Иванов Петр Иванович #} Иванов Петр Иванович
{# </p>#} </p>
{# <span class="dateComm44">#} <span class="dateComm44">
{# 13.01.2016 / 21:05#} 13.01.2016 / 21:05
{# </span>#} </span>
{# <div class="stars box-sizing">#} <div class="stars box-sizing">
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#} <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#} <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
{# <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>#} <span class="glyphicon glyphicon-star starAct" aria-hidden="true"></span>
{# <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#} <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
{# <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#} <span class="glyphicon glyphicon-star" aria-hidden="true"></span>
{# </div>#} </div>
{# <p class="textComm44">#} <p class="textComm44">
{# 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.#} 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.
{# </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">
{# Иванов Петр Иванович #} Иванов Петр Иванович
{# </p>#} </p>
{# <span class="dateComm44">#} <span class="dateComm44">
{# 13.01.2016 / 21:05#} 13.01.2016 / 21:05
{# </span>#} </span>
{# <p class="textComm44">#} <p class="textComm44">
{# 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.#} 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.
{# </p>#} </p>
{# <a href="javascript:void(0)" class="answerComm">#} <a href="javascript:void(0)" class="answerComm">
{# Ответить#} Ответить
{# </a>#} </a>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# </div>#} </div>
{# {% endwith %}#} {% 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 %} {% elif request.user.is_contractor and not request.user.contractor_answers.exists %}
<form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate> <form action="{% url 'projects:detail' pk=project.pk %}" method="POST" enctype="multipart/form-data" novalidate>
@ -418,7 +418,11 @@
{% 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>
@ -448,7 +452,16 @@
<p>Новые исполнители</p> <p>Новые исполнители</p>
</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'

2
projects/views.py
Unescape View File

@ -21,6 +21,7 @@ from users.models import User
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,
) )

Write Preview
Loading…
Cancel
Save