- - Местоположение: {{ project.realty.country }}, {{ project.realty.city }} + Местоположение:
-
Классификация здания: {{ project.realty.building_classification }}
diff --git a/projects/views.py b/projects/views.py
index 815a678..27e84fa 100644
--- a/projects/views.py
+++ b/projects/views.py
@@ -26,6 +26,7 @@ from .mixins import LastAccessMixin
class ProjectsView(ListView):
model = Project
+ template_name = 'project_list.html'
class ProjectView(LastAccessMixin, View):
diff --git a/users/migrations/0014_auto_20160615_1611.py b/users/migrations/0014_auto_20160615_1611.py
new file mode 100644
index 0000000..130df78
--- /dev/null
+++ b/users/migrations/0014_auto_20160615_1611.py
@@ -0,0 +1,28 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-15 13:11
+from __future__ import unicode_literals
+
+from django.db import migrations, models
+import django.db.models.deletion
+import mptt.fields
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('common', '0001_initial'),
+ ('users', '0013_auto_20160610_1703'),
+ ]
+
+ operations = [
+ migrations.AddField(
+ model_name='user',
+ name='location',
+ field=mptt.fields.TreeForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='users', to='common.Location'),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='patronym',
+ field=models.CharField(blank=True, max_length=255),
+ ),
+ ]
diff --git a/users/migrations/0015_auto_20160615_1747.py b/users/migrations/0015_auto_20160615_1747.py
new file mode 100644
index 0000000..26fcf13
--- /dev/null
+++ b/users/migrations/0015_auto_20160615_1747.py
@@ -0,0 +1,78 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.6 on 2016-06-15 14:47
+from __future__ import unicode_literals
+
+import datetime
+from django.db import migrations, models
+import django.db.models.deletion
+from django.utils.timezone import utc
+
+
+class Migration(migrations.Migration):
+
+ dependencies = [
+ ('users', '0014_auto_20160615_1611'),
+ ]
+
+ operations = [
+ migrations.CreateModel(
+ name='ContractorFinancialInfo',
+ fields=[
+ ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')),
+ ('fio', models.CharField(max_length=255)),
+ ('date_of_birth', models.DateTimeField()),
+ ('phone', models.CharField(max_length=30)),
+ ('residency', models.CharField(choices=[('russian_resident', 'Резидент РФ'), ('non_russian_resident', 'Нерезидент РФ'), ('refugee', 'Беженец'), ('russian_stay_permit', 'Вид на жительство')], max_length=50)),
+ ('legal_status', models.CharField(choices=[('individual', 'Физическое лицо'), ('legal_entity', 'ИП и Юридическое лицо')], max_length=30)),
+ ('passport_series', models.CharField(max_length=6)),
+ ('passport_number', models.CharField(max_length=10)),
+ ('subdivision_code', models.CharField(max_length=10)),
+ ('passport_issued_by', models.CharField(max_length=255)),
+ ('passport_issue_date', models.DateTimeField()),
+ ('inn', models.CharField(max_length=100)),
+ ('yandex_money', models.CharField(max_length=50)),
+ ('credit_card_number', models.CharField(max_length=50)),
+ ('passport_scan', models.ImageField(upload_to='users/contractors/')),
+ ],
+ options={
+ 'verbose_name': 'Финансовая информация',
+ 'verbose_name_plural': 'Финансовая информация',
+ },
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='avatar',
+ field=models.ImageField(blank=True, upload_to='users/avatars/'),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='cro',
+ field=models.BooleanField(default=False),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='date_of_birth',
+ field=models.DateTimeField(default=datetime.datetime(2016, 6, 15, 14, 47, 5, 758769, tzinfo=utc)),
+ preserve_default=False,
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='gender',
+ field=models.CharField(blank=True, choices=[('male', 'Мужской'), ('female', 'Женский')], max_length=30),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='skype',
+ field=models.CharField(blank=True, max_length=100),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='website',
+ field=models.CharField(blank=True, max_length=255),
+ ),
+ migrations.AddField(
+ model_name='user',
+ name='contractor_financial_info',
+ field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='contractor', to='users.ContractorFinancialInfo'),
+ ),
+ ]
diff --git a/users/models.py b/users/models.py
index b8ab0ac..b76330a 100644
--- a/users/models.py
+++ b/users/models.py
@@ -1,3 +1,4 @@
+from mptt.models import TreeForeignKey
from datetime import datetime
from django.db import models
from django.utils import timezone
@@ -5,7 +6,6 @@ from django.contrib.auth.models import AbstractBaseUser, BaseUserManager, Abstra
from specializations.models import Specialization
-
class UserManager(BaseUserManager):
def create_user(self, email, password=None):
if not email:
@@ -32,6 +32,48 @@ class CustomerUserManager(models.Manager):
def get_queryset(self):
return super().get_queryset().filter(groups__name='Заказчики')
+GENDERS = (
+ ('male', 'Мужской'),
+ ('female', 'Женский'),
+)
+
+
+
+class ContractorFinancialInfo(models.Model):
+ RESIDENCIES = (
+ ('russian_resident', 'Резидент РФ'),
+ ('non_russian_resident', 'Нерезидент РФ'),
+ ('refugee', 'Беженец'),
+ ('russian_stay_permit', 'Вид на жительство'),
+ )
+
+ LEGAL_STATUSES = (
+ ('individual', 'Физическое лицо'),
+ ('legal_entity', 'ИП и Юридическое лицо'),
+ )
+
+ fio = models.CharField(max_length=255)
+ date_of_birth = models.DateTimeField()
+ phone = models.CharField(max_length=30)
+ residency = models.CharField(max_length=50,choices=RESIDENCIES)
+ legal_status = models.CharField(max_length=30, choices=LEGAL_STATUSES)
+ passport_series = models.CharField(max_length=6)
+ passport_number = models.CharField(max_length=10)
+ subdivision_code = models.CharField(max_length=10)
+ passport_issued_by = models.CharField(max_length=255)
+ passport_issue_date = models.DateTimeField()
+ inn = models.CharField(max_length=100)
+ yandex_money = models.CharField(max_length=50)
+ credit_card_number = models.CharField(max_length=50)
+ passport_scan = models.ImageField(upload_to='users/contractors/')
+
+ def __str__(self):
+ return self.fio
+
+ class Meta:
+ verbose_name = 'Финансовая информация'
+ verbose_name_plural = 'Финансовая информация'
+
class User(AbstractBaseUser, PermissionsMixin):
STATUSES = (
@@ -42,13 +84,22 @@ class User(AbstractBaseUser, PermissionsMixin):
nickname = models.CharField(max_length=50, blank=True,null=True)
first_name = models.CharField(max_length=255, blank=True)
last_name = models.CharField(max_length=255, blank=True)
+ patronym = models.CharField(max_length=255, blank=True)
email = models.EmailField(max_length=255, unique=True, db_index=True)
is_active = models.BooleanField(default=True)
created = models.DateTimeField(default=timezone.now)
last_time_visit = models.DateTimeField(default=timezone.now)
contractor_specializations = models.ManyToManyField(Specialization, related_name='contractors', blank=True)
contractor_status = models.CharField(default='free', max_length=20, choices=STATUSES)
-
+ contractor_financial_info = models.OneToOneField(ContractorFinancialInfo, related_name='contractor',blank=True, null=True)
+ location = TreeForeignKey('common.Location', related_name='users', null=True, blank=True)
+ skype = models.CharField(max_length=100, blank=True)
+ gender = models.CharField(max_length=30, choices=GENDERS, blank=True)
+ cro = models.BooleanField(default=False)
+ website = models.CharField(max_length=255, blank=True)
+ date_of_birth = models.DateTimeField()
+ avatar = models.ImageField(upload_to='users/avatars/', blank=True)
+
@property
def is_staff(self):
return self.is_superuser
@@ -57,7 +108,6 @@ class User(AbstractBaseUser, PermissionsMixin):
def is_free(self):
return self.contractor_status == 'free'
-
def __str__(self):
return self.email
@@ -85,6 +135,7 @@ class User(AbstractBaseUser, PermissionsMixin):
+
class Team(models.Model):
name = models.CharField(max_length=255)
users = models.ManyToManyField(User, related_name ='teams', blank=True)
diff --git a/users/templates/contractor_profile_edit.html b/users/templates/contractor_profile_edit.html
new file mode 100644
index 0000000..7d688a3
--- /dev/null
+++ b/users/templates/contractor_profile_edit.html
@@ -0,0 +1,144 @@
+{% extends 'partials/base.html' %}
+
+{% load staticfiles %}
+
+{% block content %}
+ {% include 'partials/header.html' %}
+ ++ +{% endblock %} diff --git a/users/templates/name_snippet.html b/users/templates/name_snippet.html new file mode 100644 index 0000000..2e1a07c --- /dev/null +++ b/users/templates/name_snippet.html @@ -0,0 +1 @@ +{{ greeting }}, {{ person|default:"friend" }}! diff --git a/users/urls.py b/users/urls.py index e9380ea..fcb9be9 100755 --- a/users/urls.py +++ b/users/urls.py @@ -5,13 +5,14 @@ from .views import ( ContractorListView, ContractorOfficeDetailView, ContractorProfileDetailView, + ContractorProfileEditView, CustomerProfileCurrentProjectsView, CustomerProfileOpenProjectsView, CustomerProfileReviewsView, CustomerProfileTrashedProjectsView, # UserDetailView, # UserInfoListView, - # UserListView, + UserListView, # UserView, ) @@ -27,8 +28,9 @@ urlpatterns = [ urls.url(r'^contractors/(?P++++ +++++ +++ +++
+ ++ +++ +++Дата рождения:+Пол:++++ + + +++ ++Мужской
+ +Женский
+++Сайт:+Skype:+Электронная почта:+Телефон:++++ +++ +++ +++ +++++ ++Есть допуск СРО
++ Сохранить +++ {% include 'partials/footer.html' %} ++ +\d+)/$', ContractorProfileDetailView.as_view(), name='contractor-profile'), urls.url(r'^contractor-office/(?P \d+)/$', ContractorOfficeDetailView.as_view(), name='contractor-office'), # urls.url(r'^profile/$', UserDetailView.as_view(), name='user-detail'), - # urls.url(r'^$', UserListView.as_view(), name='users_list'), + urls.url(r'^$', UserListView.as_view(), name='users_list'), # urls.url(r'^info$', UserInfoListView.as_view(), name='users_info_list'), urls.url(r'contractors/$', ContractorListView.as_view(), name='contractor-list' ), # urls.url(r'^(?P \d+)/$', UserView.as_view(), name='user_view'), + urls.url(r'contractors/(?P \d+)/edit/$', ContractorProfileEditView.as_view(), name='contractor-edit' ), ] diff --git a/users/views.py b/users/views.py index bd0ffd0..8b2895a 100644 --- a/users/views.py +++ b/users/views.py @@ -1,4 +1,4 @@ -from django.shortcuts import render +from django.shortcuts import render, get_object_or_404 from django.contrib.auth.models import Group from django.views.generic import ListView, DetailView, View, UpdateView from django.views.generic.base import TemplateView @@ -63,3 +63,11 @@ class CustomerProfileReviewsView(BaseMixin, DetailView): model = User template_name = 'customer_profile_reviews.html' context_object_name = 'customer' + + +class ContractorProfileEditView(BaseMixin, View): + template_name = 'contractor_profile_edit.html' + + def get(self, request, *args, **kwargs): + contractor = get_object_or_404(User, pk=kwargs.get('pk')) + return render(request, self.template_name, {'contractor': contractor})