Mukhtar
10 years ago
parent
d14c827953
commit
e0547daaac
12 changed files with 839 additions and 153 deletions
@ -0,0 +1,39 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-24 10:53 |
||||
from __future__ import unicode_literals |
||||
|
||||
import datetime |
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('projects', '0004_auto_20160519_1338'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AlterModelOptions( |
||||
name='portfolio', |
||||
options={'verbose_name': 'Портфолио', 'verbose_name_plural': 'Портфолио'}, |
||||
), |
||||
migrations.AlterModelOptions( |
||||
name='portfoliophoto', |
||||
options={'verbose_name': 'Фото портфолио', 'verbose_name_plural': 'Фото портфолио'}, |
||||
), |
||||
migrations.AddField( |
||||
model_name='answer', |
||||
name='created', |
||||
field=models.DateTimeField(default=datetime.datetime(2016, 5, 24, 10, 53, 28, 347882)), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answer', |
||||
name='cost_type', |
||||
field=models.CharField(choices=[('rur', 'rur'), ('usd', 'usd'), ('eur', 'eur')], default='RUR', max_length=5), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answer', |
||||
name='term_type', |
||||
field=models.CharField(choices=[('hour', 'hour'), ('day', 'day'), ('month', 'month')], default='HOUR', max_length=10), |
||||
), |
||||
] |
||||
@ -0,0 +1,80 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-24 12:08 |
||||
from __future__ import unicode_literals |
||||
|
||||
import datetime |
||||
from django.conf import settings |
||||
from django.db import migrations, models |
||||
import django.db.models.deletion |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
migrations.swappable_dependency(settings.AUTH_USER_MODEL), |
||||
('projects', '0005_auto_20160524_1053'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.CreateModel( |
||||
name='Candidate', |
||||
fields=[ |
||||
('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), |
||||
('status', models.BooleanField(default=False)), |
||||
], |
||||
options={ |
||||
'verbose_name': 'Кандидат', |
||||
'verbose_name_plural': 'Кандидаты', |
||||
}, |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='budget', |
||||
field=models.CharField(blank=True, max_length=20), |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='cro', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='secure_transaction', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='term_cost', |
||||
field=models.BooleanField(default=False), |
||||
), |
||||
migrations.AddField( |
||||
model_name='project', |
||||
name='type_work', |
||||
field=models.CharField(choices=[('1', 'проектирование'), ('2', 'техническое сопровождение')], default='1', max_length=20), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answer', |
||||
name='cost_type', |
||||
field=models.CharField(choices=[('rur', 'rur'), ('usd', 'usd'), ('eur', 'eur')], default='rur', max_length=5), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answer', |
||||
name='created', |
||||
field=models.DateTimeField(default=datetime.datetime(2016, 5, 24, 12, 8, 51, 751897)), |
||||
), |
||||
migrations.AlterField( |
||||
model_name='answer', |
||||
name='term_type', |
||||
field=models.CharField(choices=[('hour', 'hour'), ('day', 'day'), ('month', 'month')], default='hour', max_length=10), |
||||
), |
||||
migrations.AddField( |
||||
model_name='candidate', |
||||
name='project', |
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='candidates', to='projects.Project'), |
||||
), |
||||
migrations.AddField( |
||||
model_name='candidate', |
||||
name='user', |
||||
field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='candidates', to=settings.AUTH_USER_MODEL), |
||||
), |
||||
] |
||||
@ -1,31 +1,244 @@ |
||||
{% extends "base.html" %} |
||||
{% block content %} |
||||
<h1>Добавление</h1> |
||||
<form method="post" action=""> |
||||
|
||||
{{ form.errors }} |
||||
{% csrf_token %} |
||||
|
||||
{% for field in form %} |
||||
<div class="row"> |
||||
{{ field.label }} |
||||
{{ field }} |
||||
</div> |
||||
{% endfor %} |
||||
{# <h1>Добавление</h1>#} |
||||
{# <form method="post" action="">#} |
||||
{##} |
||||
{# {{ form.errors }}#} |
||||
{# {% csrf_token %}#} |
||||
{##} |
||||
{# {% for field in form %}#} |
||||
{# <div class="col-lg-12">#} |
||||
{# <input type="text" class="searchInp box-sizing" placeholder="{{ field.label }}" name=" {{ field.name }}">#} |
||||
{# <div class="row">#} |
||||
{# {{ field.label }}#} |
||||
{# {{ field }}#} |
||||
{# </div>#} |
||||
{##} |
||||
{# {% endfor %}#} |
||||
<input type="submit" value="Создать" /> |
||||
{# <input type="text" name="{{ form.name.name }}" class="col-xs-10 form-control" placeholder="Название" />#} |
||||
{# <p>{{ form.name.errors.as_text }}</p>#} |
||||
{# <input type="text" name="{{ form.price.name }}" class="col-xs-10 form-control" placeholder="Цена" />#} |
||||
{# <p>{{ form.price.errors.as_text }}</p>#} |
||||
{# <textarea name="{{ form.text.name }}"></textarea>#} |
||||
{# <p>{{ form.text.errors.as_text }}</p>#} |
||||
{# #} |
||||
{# <button type="submit" class="btn registr_button">Добавить</button>#} |
||||
</form> |
||||
{% endblock %}s |
||||
{# <input type="submit" value="Создать" />#} |
||||
{# </form>#} |
||||
|
||||
|
||||
{% block content %} |
||||
<div class="col-lg-12 allProjects"> |
||||
<p class="titleScore">Новый заказ</p> |
||||
</div> |
||||
<div class="chatBlock new-rass new-rass2 disTab"> |
||||
{{ form.errors }} |
||||
<form action="" method="post"> {% csrf_token %} |
||||
<div class="col-lg-9"> |
||||
<p class="new-pp new-pp3">Формирование заказа</p> |
||||
<div class="textAreaBlock2 text-nn box-sizing disTab"> |
||||
<p>Название заказа</p> |
||||
<input type="text" class="box-sizing" name="{{ form.name.name }}" /> |
||||
|
||||
</div> |
||||
<div class="textAreaBlock2 text-nn box-sizing disTab"> |
||||
<p>Подробно опишите задание</p> |
||||
<textarea name="{{ form.text.name }}" id="text-new"></textarea> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-3 wrChat1"> |
||||
<div class="messageBlock box-sizing disTab"> |
||||
<p>Дополнительно</p> |
||||
</div> |
||||
<div class="col-lg-12 documentsChat"> |
||||
<form action="" method="post"> |
||||
<div class="upload"> |
||||
<input type="file" name="upload"/> |
||||
<p>+ добавить файл (до 100 файлов)</p> |
||||
</div> |
||||
</form> |
||||
<ul class="list-new-new"> |
||||
<li> |
||||
Архитерурное 2.jpg |
||||
<span>7мб</span> |
||||
<div></div> |
||||
</li> |
||||
<li> |
||||
Архитерурное 2.jpg |
||||
<span>7мб</span> |
||||
<div></div> |
||||
</li> |
||||
</ul> |
||||
</div> |
||||
<p class="type-work">Тип работы:</p> |
||||
<div class="mail-block type-work-inset"> |
||||
<div class="inset-mb"> |
||||
<label><input type="radio" name="radio1"><span></span></label> |
||||
<p>Проектирование</p> |
||||
</div> |
||||
<div class="inset-mb"> |
||||
<label><input type="radio" name="radio1"><span></span></label> |
||||
<p>Техническое сопровождение</p> |
||||
</div> |
||||
</div> |
||||
<div class="textAreaBlock2 box-sizing disTab"> |
||||
<a href="javascriptt:void(0)" class="new-link new-lw">+ Добавить раздел</a> |
||||
</div> |
||||
</div> |
||||
</div> |
||||
<div class="col-lg-12 new-filter"> |
||||
<div class="filter clearfix"> |
||||
<div class="titleF1 disTab"> |
||||
<div class="col-lg-3">Специализация проекта:</div> |
||||
<div class="col-lg-3"></div> |
||||
<div class="col-lg-3"></div> |
||||
<div class="col-lg-3"></div> |
||||
</div> |
||||
<div class="polsF1 disTab"> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
</div> |
||||
<div class="titleF1 titleF2 disTab"> |
||||
<div class="col-lg-4">Бюджет</div> |
||||
<div class="col-lg-8"></div> |
||||
</div> |
||||
<div class="searchF1 polsF1 polsFF"> |
||||
<div class="col-lg-4"> |
||||
<input type="text" class="box-sizing surr"> |
||||
<select class="selectpicker2 valul"> |
||||
<option>$</option> |
||||
<option>$</option> |
||||
<option>$</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>За проект</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-5 dog-new"> |
||||
<label><input type="checkbox" name="dogovor"><span></span></label> |
||||
<p>или по договоренности</p> |
||||
</div> |
||||
</div> |
||||
<div class="searchF1 polsF1 polsFF make-new"> |
||||
<label><input type="checkbox" name="dogovor"><span></span></label> |
||||
<p>Сделать для исполнителей обязательным для заполнения поля цена и срок</p> |
||||
</div> |
||||
<div class="titleF1 titleF2 disTab"> |
||||
<div class="col-lg-12">Способ оплаты</div> |
||||
</div> |
||||
<div class="searchF1 polsF1 polsFF radio-afer"> |
||||
<div class="col-lg-6"> |
||||
<label><input type="radio" name="afer"><span></span></label> |
||||
<p class="text-afer"> |
||||
Безопасная сделка (с резервированием бюджета) |
||||
</p> |
||||
<p class="des-afer"> |
||||
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. |
||||
</p> |
||||
</div> |
||||
<div class="col-lg-6"> |
||||
<label><input type="radio" name="afer"><span></span></label> |
||||
<p class="text-afer"> |
||||
Прямая оплата Исполнителю на его кошелек/счет |
||||
</p> |
||||
<p class="des-afer"> |
||||
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. |
||||
</p> |
||||
</div> |
||||
</div> |
||||
<div class="resSearchF1"> |
||||
<div class="col-lg-3"> |
||||
<p class="titleResF1">Расширенный поиск</p> |
||||
<button class="resButtonF1"> |
||||
<span class="glyphicon glyphicon-arrow-up" aria-hidden="true"></span> |
||||
</button> |
||||
</div> |
||||
<div class="col-lg-9"> |
||||
<div class="borderS1"></div> |
||||
</div> |
||||
</div> |
||||
<div class="slideRes disTab activeSlide"> |
||||
<div class="titleF1 disTab"> |
||||
<div class="col-lg-3">Выбор объекта:</div> |
||||
<div class="col-lg-3">Наименование:</div> |
||||
<div class="col-lg-3">Классификация здания:</div> |
||||
<div class="col-lg-3">Вид строительства:</div> |
||||
</div> |
||||
<div class="polsF1 polsF2 disTab"> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<input type="text" class="box-sizing surr surr2"> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Mustard</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
</div> |
||||
<div class="titleF1 disTab"> |
||||
<div class="col-lg-12">Местоположение:</div> |
||||
</div> |
||||
<div class="polsF1 polsF2 disTab"> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Страна</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-3"> |
||||
<select class="selectpicker"> |
||||
<option>Город</option> |
||||
<option>Ketchup</option> |
||||
<option>Relish</option> |
||||
</select> |
||||
</div> |
||||
<div class="col-lg-6 make-new"> |
||||
<label><input type="checkbox" name="dogovor"><span></span></label> |
||||
<p>Требуется допуск СРО</p> |
||||
</div> |
||||
</div> |
||||
<div class="searchF1 polsF1 polsFF links-filter"> |
||||
<a href="javascript:void(0)">Разместить проект</a> |
||||
<a href="javascript:void(0)">Сохранить</a> |
||||
</div> |
||||
</form> |
||||
</div> |
||||
</div> |
||||
|
||||
</div> |
||||
{% endblock %} |
||||
|
||||
@ -0,0 +1,21 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-24 10:52 |
||||
from __future__ import unicode_literals |
||||
|
||||
import datetime |
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('users', '0002_team_groups'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.AddField( |
||||
model_name='user', |
||||
name='created_at', |
||||
field=models.DateTimeField(default=datetime.datetime(2016, 5, 24, 10, 52, 56, 737277)), |
||||
), |
||||
] |
||||
@ -0,0 +1,25 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-24 10:53 |
||||
from __future__ import unicode_literals |
||||
|
||||
import datetime |
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('users', '0003_user_created_at'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.RemoveField( |
||||
model_name='team', |
||||
name='groups', |
||||
), |
||||
migrations.AlterField( |
||||
model_name='user', |
||||
name='created_at', |
||||
field=models.DateTimeField(default=datetime.datetime(2016, 5, 24, 10, 53, 15, 497921)), |
||||
), |
||||
] |
||||
@ -0,0 +1,25 @@ |
||||
# -*- coding: utf-8 -*- |
||||
# Generated by Django 1.9.6 on 2016-05-24 10:54 |
||||
from __future__ import unicode_literals |
||||
|
||||
import datetime |
||||
from django.db import migrations, models |
||||
|
||||
|
||||
class Migration(migrations.Migration): |
||||
|
||||
dependencies = [ |
||||
('users', '0004_auto_20160524_1053'), |
||||
] |
||||
|
||||
operations = [ |
||||
migrations.RemoveField( |
||||
model_name='user', |
||||
name='created_at', |
||||
), |
||||
migrations.AddField( |
||||
model_name='user', |
||||
name='created', |
||||
field=models.DateTimeField(default=datetime.datetime(2016, 5, 24, 10, 54, 13, 805566)), |
||||
), |
||||
] |
||||
Loading…
Reference in new issue