diff --git a/projects/admin.py b/projects/admin.py index 63a806e..7c4ac6f 100644 --- a/projects/admin.py +++ b/projects/admin.py @@ -2,17 +2,13 @@ from django.contrib import admin from .models import Project, Portfolio, PortfolioPhoto, \ Answer, Realty, Candidate, Order, Stage, Country, City,\ - BuildingClassfication, ConstructionType + BuildingClassfication, ConstructionType, ProjectFile -# class UserAdmin(admin.ModelAdmin): -# readonly_fields = ('pk',) -# list_display = ('email','is_active',) -# -# def get_groups(self, obj): -# return ', '.join(g.name for g in obj.groups.all()) + +class ProjectAdmin(admin.ModelAdmin): + readonly_fields = ('pk',) -admin.site.register(Project) admin.site.register(Answer) admin.site.register(Portfolio) admin.site.register(PortfolioPhoto) @@ -24,3 +20,5 @@ admin.site.register(Country) admin.site.register(City) admin.site.register(BuildingClassfication) admin.site.register(ConstructionType) +admin.site.register(Project, ProjectAdmin) +admin.site.register(ProjectFile) diff --git a/projects/forms.py b/projects/forms.py index 30b5a8c..75f9aed 100644 --- a/projects/forms.py +++ b/projects/forms.py @@ -10,12 +10,22 @@ class ProjectForm(ModelForm): model = Project fields = ( + 'budget', + 'budget_by_agreement', + 'created', + 'cro', + 'currency', + 'customer', 'name', - 'price', - 'secure_transaction', + 'price_and_term_required', + 'realty', + 'secure_deal', 'specialization', + 'term', + 'term_type', 'text', - 'type_work', + 'work_type', + # TODO: Add "files" ) @@ -56,30 +66,30 @@ class AnswerForm(ModelForm): model = Answer fields = ( - 'cost', - 'cost_type', - 'term', - 'term_type', - 'text', + # 'cost', + # 'cost_type', + # 'term', + # 'term_type', + # 'text', ) - widgets = { - # 'project': HiddenInput(), - 'cost_type': Select(attrs={'class':'selectpicker'}), - 'term_type': Select(attrs={'class':'selectpicker'}), - } + # widgets = { + # # 'project': HiddenInput(), + # 'cost_type': Select(attrs={'class':'selectpicker'}), + # 'term_type': Select(attrs={'class':'selectpicker'}), + # } class StageForm(ModelForm): class Meta: model = Stage fields = ( - 'cost', - 'cost_type', - 'name', - 'result', - 'term', - 'term_type', + # 'cost', + # 'cost_type', + # 'name', + # 'result', + # 'term', + # 'term_type', ) from django.forms.models import inlineformset_factory diff --git a/projects/migrations/0025_auto_20160609_1916.py b/projects/migrations/0025_auto_20160609_1916.py new file mode 100644 index 0000000..077f15f --- /dev/null +++ b/projects/migrations/0025_auto_20160609_1916.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.6 on 2016-06-09 16:16 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0024_auto_20160609_1808'), + ] + + operations = [ + migrations.AlterField( + model_name='projectfile', + name='project', + field=models.ForeignKey(on_delete=django.db.models.deletion.CASCADE, related_name='files', to='projects.Project'), + ), + ] diff --git a/projects/models.py b/projects/models.py index 84bdf0a..d6bc34e 100644 --- a/projects/models.py +++ b/projects/models.py @@ -111,7 +111,11 @@ class Project(models.Model): class ProjectFile(models.Model): file = models.FileField(upload_to='projects/project_files') - project = models.ForeignKey(Project) + project = models.ForeignKey(Project, related_name='files') + + class Meta: + verbose_name = 'Файл проекта' + verbose_name_plural = 'Файлы проектов' class Answer(models.Model): diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index 2835c3f..096732e 100644 --- a/projects/templates/customer_project_create.html +++ b/projects/templates/customer_project_create.html @@ -46,11 +46,11 @@

Тип работы:

- +

Проектирование

- +

Техническое сопровождение

@@ -181,7 +181,7 @@
- diff --git a/projects/views.py b/projects/views.py index 46b9790..ede9e81 100644 --- a/projects/views.py +++ b/projects/views.py @@ -84,7 +84,7 @@ class ProjectCreateView(PermissionRequiredMixin, View): realty.user = request.user realty.save() project = form_project.save(commit=False) - project.user = request.user + project.customer = request.user project.realty = realty project.save() diff --git a/templates/home.html b/templates/home.html index 996c772..f6a96a0 100644 --- a/templates/home.html +++ b/templates/home.html @@ -20,7 +20,7 @@
- Я исполнитель + Я исполнитель

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo.

@@ -31,7 +31,7 @@
- Я исполнитель + Я заказчик

Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo.

diff --git a/templates/partials/header.html b/templates/partials/header.html index 06e0db8..5849e94 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -20,9 +20,7 @@
  • {% if user.is_contractor %} - Мой офис - {% elif user.is_customer %} - Мой офис + Мой офис {% endif %}
    • @@ -34,7 +32,15 @@
    - profile-image + {% if user.is_contractor %} + + profile-image + + {% elif user.is_customer %} + + profile-image + + {% endif %}
    @@ -42,18 +48,20 @@
    diff --git a/users/templates/customer_profile.html b/users/templates/customer_profile.html index 308cc54..3111c63 100644 --- a/users/templates/customer_profile.html +++ b/users/templates/customer_profile.html @@ -99,7 +99,7 @@
    -

    Разместить заказ

    +

    Разместить заказ

    diff --git a/users/urls.py b/users/urls.py index 5f181ef..c6c09b5 100755 --- a/users/urls.py +++ b/users/urls.py @@ -12,8 +12,8 @@ urlpatterns = [ 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'^contractors/(?P\d+)$', ContractorProfileDetailView.as_view(), name='contractor-view'), + urls.url(r'^contractors/(?P\d+)$', ContractorProfileDetailView.as_view(), name='contractor-profile'), urls.url(r'^contractor-office/(?P\d+)$', ContractorOfficeDetailView.as_view(), name='contractor-office'), - urls.url(r'^customers/(?P\d+)$', CustomerProfileView.as_view(), name='customer-view'), + urls.url(r'^customers/(?P\d+)$', CustomerProfileView.as_view(), name='customer-profile'), urls.url(r'^(?P\d+)$', UserView.as_view(), name='user_view'), ]