ArturBaybulatov
10 years ago
parent
6c5a2779e6
commit
88f32d0d63
12 changed files with 433 additions and 438 deletions
@ -0,0 +1,43 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-08-02 11:14 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
import django.utils.timezone |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('contenttypes', '0002_remove_content_type_name'), |
||||
('projects', '0008_merge'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterModelOptions( |
||||
name='answer', |
||||
options={'ordering': ('-created',), 'verbose_name': 'Отклик на проект', 'verbose_name_plural': 'Отклики на проекты'}, |
||||
), |
||||
migrations.RemoveField( |
||||
model_name='answer', |
||||
name='contractor', |
||||
), |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='content_type', |
||||
field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, to='contenttypes.ContentType'), |
||||
preserve_default=False, |
||||
), |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='object_id', |
||||
field=models.IntegerField(default=None), |
||||
preserve_default=False, |
||||
), |
||||
migrations.AlterField( |
||||
model_name='stage', |
||||
name='created', |
||||
field=models.DateTimeField(default=django.utils.timezone.now), |
||||
), |
||||
] |
||||
@ -0,0 +1,29 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-08-02 13:34 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0009_auto_20160802_1414'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.CreateModel( |
||||
name='AnswerFiles', |
||||
fields=[ |
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
('name', models.CharField(max_length=255)), |
||||
('file', models.FileField(upload_to='projects/answer_files')), |
||||
('answer', models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='files', to='projects.Answer')), |
||||
], |
||||
options={ |
||||
'verbose_name_plural': 'Файлы для откликов', |
||||
'verbose_name': 'Файл для отклика', |
||||
}, |
||||
), |
||||
] |
||||
@ -0,0 +1,25 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.7 on 2016-08-02 13:53 |
||||
from __future__ import unicode_literals |
||||
|
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0010_answerfiles'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='portfolios', |
||||
field=models.ManyToManyField(blank=True, related_name='answers', to='projects.Portfolio'), |
||||
), |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='secure_deal_only', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
] |
||||
@ -1,215 +0,0 @@ |
||||
{% extends 'partials/base.html' %} |
||||
|
||||
{% block content %} |
||||
{% include 'partials/header.html' %} |
||||
{% load staticfiles %} |
||||
{% load humanize %} |
||||
<div class="container mainScore"> |
||||
<div class="row"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleScore">{{ project }}</p> |
||||
</div> |
||||
<div class="doneBlock disTab"> |
||||
<div class="triangle1"></div> |
||||
<div class="col-lg-4"> |
||||
<a href="#" class="aLinkExe"><div class="imgExecutor"> |
||||
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image"> |
||||
</div></a> |
||||
<p class="nameExecutor"> |
||||
<a href="#">{{ project.contractor.get_full_name }} [ivanov_petr]</a> |
||||
</p> |
||||
<p class="navv2">На сайте {{ project.contractor.created | naturaltime }}</p> |
||||
<ul class="rettList restList3"> |
||||
<li> |
||||
<a href="javascript:void(0)">Отзывы: |
||||
<span> + 0</span> |
||||
<small> 0</small> |
||||
<mark> - 0</mark> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-3 col-lg-offset-1"> |
||||
<div class="dashedCol4 dashedCol44 dashedColColor"> |
||||
<p class="specUser"> |
||||
Специализации: |
||||
</p> |
||||
<div class="insetSpec"> |
||||
<span>{{ project.specialization }}</span> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-4 retts"> |
||||
<ul class="desListPro"> |
||||
<li> |
||||
{{ project.created }} |
||||
</li> |
||||
<li> |
||||
{{ project.type_work }} |
||||
</li> |
||||
</ul> |
||||
{% if project.secure_transaction %} |
||||
<div class="sroUser sroExecutor sroPro"> |
||||
<div class="iconSRO"></div> |
||||
<p>Есть допуск СРО</p> |
||||
</div> |
||||
{% endif %} |
||||
</div> |
||||
</div> |
||||
<div class="infoProjectBlock disTab"> |
||||
<div class="triangle2"></div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<ul class="listProjectIn"> |
||||
<li> |
||||
<span>Местоположение:</span> {{ project.realty.country }}, {{ project.realty.city }} |
||||
</li> |
||||
<li> |
||||
<span>Классификация здания:</span> {{ project.realty.building_classification }} |
||||
</li> |
||||
<li> |
||||
<span>Вид строительства:</span> {{ project.realty.type_construction }} |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<p class="textProIn"> |
||||
{{ project.text }} |
||||
</p> |
||||
</div> |
||||
<div class="col-lg-10 col-lg-offset-1"> |
||||
<a href="{% url 'projects:customer-project-edit' pk=project.pk %}?back={{ request.path }}" class="linkProIn linkProIn1"> |
||||
Редактировать |
||||
</a> |
||||
|
||||
<form action="{% url 'projects:customer-project-trash' pk=project.pk %}" method="POST"> |
||||
{% csrf_token %} |
||||
<input type="hidden" name="next" value="{{ request.path }}"> |
||||
|
||||
<a href="#" onclick="$(this).closest('form').submit(); return false" class="linkProIn linkProIn2"> |
||||
Снять с публикации |
||||
</a> |
||||
</form> |
||||
</div> |
||||
</div> |
||||
<div class="exBigBlock disTab"> |
||||
<div class="col-lg-12"> |
||||
<p class="titleEx">Исполнители</p> |
||||
</div> |
||||
<div class="col-lg-12 exButton"> |
||||
<div class="btn-group" role="group" aria-label="..."> |
||||
<button type="button" class="btn btn-default"> |
||||
Новые <span>+0</span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Кандидаты <span>0</span> |
||||
</button> |
||||
<button type="button" class="btn btn-default"> |
||||
Отказал <span>0</span> |
||||
</button> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-12 compareBlock"> |
||||
<div class="col-lg-2 col-lg-offset-5"> |
||||
<p>Сравнить кандидатов</p> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-12 exNew"> |
||||
<p>Новые исполнители</p> |
||||
</div> |
||||
<div class="candidateBlock disTab"> |
||||
{% for answer in project.answers.all %} |
||||
<div class="candidate"> |
||||
<div class="col-lg-4"> |
||||
<a href="#" class="aLinkExe"><div class="imgExecutor"> |
||||
<img src="{% static 'img/profile.jpg' %}" alt="execitor-image"> |
||||
</div></a> |
||||
<p class="nameExecutor"> |
||||
<a href="#"> {{ answer.contractor.get_full_name }} []</a> |
||||
</p> |
||||
<p class="navv2">На сайте {{ answer.contractor.created }}</p> |
||||
<div class="statusUser">Свободен</div> |
||||
</div> |
||||
<div class="col-lg-3 retts"> |
||||
<ul class="rettList restList2"> |
||||
<li>Рейтинг: <span> 0</span></li> |
||||
<li>Безопасные сделки: <span> 0</span></li> |
||||
<li> |
||||
<a href="javascript:void(0)">Отзывы: |
||||
<span> + 0</span> |
||||
<small> 0</small> |
||||
<mark> - 0</mark> |
||||
</a> |
||||
</li> |
||||
</ul> |
||||
<div class="sroUser sroExecutor"> |
||||
<div class="iconSRO"></div> |
||||
<p>Есть допуск СРО</p> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-2 listCens"> |
||||
<p>Цена: |
||||
<span> {{ answer.cost| intcomma }}</span> |
||||
<i class="fa fa-rub"></i> |
||||
</p> |
||||
<p> |
||||
Срок: <span>{{ answer.term }} {{ answer.term_type }}</span> |
||||
</p> |
||||
<p>Опубликован: {{ answer.created }}</p> |
||||
</div> |
||||
<div class="col-lg-3 retts"> |
||||
|
||||
<a href="{% url 'projects:add-candidate' answer_id=answer.id project_id=project.id %}" class="candLink candLink1"> |
||||
Кандидат |
||||
</a> |
||||
<a href="{% url 'projects:offer-order' answer_id=answer.id project_id=project.id %}" class="candLink candLink2"> |
||||
предложить проект |
||||
</a> |
||||
<a href="javascript:void(0)" class="candLink candLink3"> |
||||
отказ |
||||
</a> |
||||
</div> |
||||
<div class="gallMini disTab"> |
||||
<div class="col-lg-3"> |
||||
<div class="insetCol box-sizing disTab"> |
||||
<div class="imgGal"> |
||||
<div class="imgFigure"></div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="commBlock44 disTab"> |
||||
{# <div class="comm44 disTab">#} |
||||
{# <div class="col-lg-10 col-lg-offset-1">#} |
||||
{# <p class="nameComm">#} |
||||
{# Иванов Петр Иванович#} |
||||
{# </p>#} |
||||
{# <span class="dateComm44">#} |
||||
{# 13.0.2016 / 21:05#} |
||||
{# </span>#} |
||||
{# <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" aria-hidden="true"></span>#} |
||||
{# <span class="glyphicon glyphicon-star" aria-hidden="true"></span>#} |
||||
{# </div>#} |
||||
{# <p class="textComm44">Lorem ipsum dolor sit amet</p>#} |
||||
{# </div>#} |
||||
{# </div>#} |
||||
</div> |
||||
</div> |
||||
{% endfor %} |
||||
</div> |
||||
|
||||
<div class="col-lg-12 pagin"> |
||||
{% include 'partials/pagination.html' %} |
||||
</div> |
||||
|
||||
{% include 'partials/footer.html' %} |
||||
</div> |
||||
</div> |
||||
{% endblock %} |
||||
|
||||
|
||||
|
||||
Loading…
Reference in new issue