diff --git a/projects/migrations/0017_auto_20160606_1659.py b/projects/migrations/0017_auto_20160606_1659.py
new file mode 100644
index 0000000..96de7fd
--- /dev/null
+++ b/projects/migrations/0017_auto_20160606_1659.py
@@ -0,0 +1,50 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-06 13:59
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('projects', '0016_auto_20160603_1140'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='Stage',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('name', models.CharField(max_length=255)),
+ ('result', models.CharField(max_length=255)),
+ ('cost', models.DecimalField(decimal_places=0, max_digits=10)),
+ ('cost_type', models.CharField(choices=[('rur', 'rur'), ('usd', 'usd'), ('eur', 'eur')], default='rur', max_length=5)),
+ ('term', models.IntegerField(default=0)),
+ ('term_type', models.CharField(choices=[('hour', 'hour'), ('day', 'day'), ('month', 'month')], default='hour', max_length=10)),
+ ],
+ options={
+ 'verbose_name_plural': 'Этапы',
+ 'verbose_name': 'Этап',
+ },
+ ),
+ migrations.RemoveField(
+ model_name='order',
+ name='cost',
+ ),
+ migrations.RemoveField(
+ model_name='order',
+ name='term',
+ ),
+ migrations.AddField(
+ model_name='order',
+ name='secure',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AddField(
+ model_name='stage',
+ name='order',
+ field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='stages', to='projects.Order'),
+ ),
+ ]
diff --git a/projects/models.py b/projects/models.py
index 0f02d42..9a29cb4 100644
--- a/projects/models.py
+++ b/projects/models.py
@@ -5,6 +5,18 @@ from django.utils import timezone
from users.models import User
from specializations.models import Specialization
+COST_TYPE_CHOICES = (
+ ('rur', 'rur'),
+ ('usd', 'usd'),
+ ('eur', 'eur'),
+)
+
+TERM_TYPE_CHOICES = (
+ ('hour', 'hour'),
+ ('day', 'day'),
+ ('month', 'month'),
+)
+
class Realty(models.Model):
BUILDING_CLASSIFICATION_CHOICES = (
@@ -58,10 +70,9 @@ class Project(models.Model):
class Order(models.Model):
project = models.OneToOneField(Project, related_name='order')
contractor = models.ForeignKey(User)
- cost = models.DecimalField(max_digits=10, decimal_places=0)
- term = models.IntegerField(default=1)
created = models.DateTimeField(default=timezone.now, editable=False)
status = models.BooleanField(default=False)
+ secure = models.BooleanField(default=False)
def __str__(self):
return self.project.name
@@ -71,19 +82,25 @@ class Order(models.Model):
verbose_name_plural = 'Заказы'
+
+
+class Stage(models.Model):
+ name = models.CharField(max_length=255)
+ result = models.CharField(max_length=255)
+ cost = models.DecimalField(max_digits=10, decimal_places=0)
+ cost_type = models.CharField(max_length=5, choices=COST_TYPE_CHOICES, default='rur')
+ term = models.IntegerField(default=0)
+ term_type = models.CharField(max_length=10, choices=TERM_TYPE_CHOICES, default='hour')
+ order = models.ForeignKey(Order, related_name='stages')
+
+ def __str__(self):
+ return self.name
+
+ class Meta:
+ verbose_name = 'Этап'
+ verbose_name_plural = 'Этапы'
+
class Answer(models.Model):
- COST_TYPE_CHOICES = (
- ('rur', 'rur'),
- ('usd', 'usd'),
- ('eur', 'eur'),
- )
-
- TERM_TYPE_CHOICES = (
- ('hour', 'hour'),
- ('day', 'day'),
- ('month', 'month'),
- )
-
cost = models.DecimalField(max_digits=10, decimal_places=0)
cost_type = models.CharField(max_length=5, choices=COST_TYPE_CHOICES, default='rur')
text = models.TextField()
@@ -114,10 +131,11 @@ class Candidate(models.Model):
verbose_name = 'Кандидат'
verbose_name_plural = 'Кандидаты'
+
class Portfolio(models.Model):
name = models.CharField(max_length=255)
description = models.TextField()
- user = models.ForeignKey(User,related_name='portfolio')
+ user = models.ForeignKey(User, related_name='portfolio')
def __str__(self):
return self.name
@@ -135,8 +153,5 @@ class PortfolioPhoto(models.Model):
verbose_name = 'Фото портфолио'
verbose_name_plural = 'Фото портфолио'
- # def __str__(self):
- # return self.img
-
-
-
+ # def __str__(self):
+ # return self.img
diff --git a/projects/templates/projects/project_detail.html b/projects/templates/projects/project_detail.html
index 25fadab..a5bc0d9 100644
--- a/projects/templates/projects/project_detail.html
+++ b/projects/templates/projects/project_detail.html
@@ -95,9 +95,9 @@
diff --git a/projects/templates/projects/project_form.html b/projects/templates/projects/project_form.html
index 6b4fea0..3104c67 100644
--- a/projects/templates/projects/project_form.html
+++ b/projects/templates/projects/project_form.html
@@ -71,10 +71,10 @@
-{# #}
+
- {{ project_form.specialization }}
+{# {{ project_form.specialization }}#}