diff --git a/archilance/settings/dev.py b/archilance/settings/dev.py index 9603670..52aa52c 100644 --- a/archilance/settings/dev.py +++ b/archilance/settings/dev.py @@ -2,7 +2,7 @@ from .base import * # AUTH_PASSWORD_VALIDATORS = [] -# INSTALLED_APPS += ['debug_toolbar',] +INSTALLED_APPS += ['debug_toolbar',] try: from .local import * diff --git a/templates/partials/header.html b/templates/partials/header.html index 7e002a7..66822fb 100644 --- a/templates/partials/header.html +++ b/templates/partials/header.html @@ -1,4 +1,5 @@ {% load staticfiles %} + {% load thumbnail %}
@@ -54,7 +55,9 @@
{% if request.user.is_contractor %} - profile-image + {% thumbnail request.user.avatar "75x75" crop="center" as im %} + profile-image + {% endthumbnail %} {% elif request.user.is_customer %} diff --git a/users/admin.py b/users/admin.py index 4e404c4..1d81876 100644 --- a/users/admin.py +++ b/users/admin.py @@ -1,6 +1,6 @@ from django.contrib import admin -from .models import User, Team, ContractorFinancialInfo +from .models import User, Team, ContractorFinancialInfo, ContractorResume, ContractorResumeFiles class UserAdmin(admin.ModelAdmin): @@ -13,3 +13,5 @@ class UserAdmin(admin.ModelAdmin): admin.site.register(User, UserAdmin) admin.site.register(ContractorFinancialInfo) admin.site.register(Team) +admin.site.register(ContractorResume) +admin.site.register(ContractorResumeFiles) diff --git a/users/migrations/0020_auto_20160711_1759.py b/users/migrations/0020_auto_20160711_1759.py new file mode 100644 index 0000000..0d729f3 --- /dev/null +++ b/users/migrations/0020_auto_20160711_1759.py @@ -0,0 +1,47 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-11 14:59 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0019_auto_20160710_1950'), + ] + + operations = [ + migrations.CreateModel( + name='ContractorResume', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('text', models.TextField()), + ('resume_file', models.FileField(upload_to='users/resume/files/')), + ], + options={ + 'verbose_name': 'Резюме', + 'verbose_name_plural': 'Резюме', + }, + ), + migrations.CreateModel( + name='ContractorResumeFiles', + fields=[ + ('id', models.AutoField(auto_created=True, primary_key=True, serialize=False, verbose_name='ID')), + ('img', models.ImageField(upload_to='users/resume/images/')), + ('title', models.CharField(max_length=255)), + ('description', models.TextField(blank=True)), + ('type', models.CharField(choices=[('diplom', 'Дипломы/Сертификаты'), ('cro', 'Допуск CPO')], max_length=50)), + ], + options={ + 'verbose_name': 'Файлы резюме', + 'verbose_name_plural': 'Файлы резюме', + }, + ), + migrations.AddField( + model_name='user', + name='contractor_resume', + field=models.OneToOneField(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='contractor', to='users.ContractorResume'), + ), + ] diff --git a/users/migrations/0021_contractorresumefiles_resume.py b/users/migrations/0021_contractorresumefiles_resume.py new file mode 100644 index 0000000..00b4577 --- /dev/null +++ b/users/migrations/0021_contractorresumefiles_resume.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-07-11 16:27 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0020_auto_20160711_1759'), + ] + + operations = [ + migrations.AddField( + model_name='contractorresumefiles', + name='resume', + field=models.ForeignKey(default=None, on_delete=django.db.models.deletion.CASCADE, related_name='resume_files', to='users.ContractorResume'), + preserve_default=False, + ), + ] diff --git a/users/models.py b/users/models.py index fe84289..f26d5d9 100644 --- a/users/models.py +++ b/users/models.py @@ -77,6 +77,38 @@ class ContractorFinancialInfo(models.Model): verbose_name = 'Финансовая информация' verbose_name_plural = 'Финансовая информация' +class ContractorResume(models.Model): + text = models.TextField() + resume_file = models.FileField(upload_to='users/resume/files/') + + def __str__(self): + return self.text + + class Meta: + verbose_name = 'Резюме' + verbose_name_plural = 'Резюме' + + +RESUME_TYPE_FILES = ( + ('diplom', 'Дипломы/Сертификаты'), + ('cro', 'Допуск CPO'), +) + + +class ContractorResumeFiles(models.Model): + img = models.ImageField(upload_to='users/resume/images/') + title = models.CharField(max_length=255) + description = models.TextField(blank=True) + type = models.CharField(max_length=50, choices=RESUME_TYPE_FILES) + resume = models.ForeignKey(ContractorResume, related_name='resume_files') + + def __str__(self): + return self.title + + class Meta: + verbose_name = 'Файлы резюме' + verbose_name_plural = 'Файлы резюме' + class User(AbstractBaseUser, PermissionsMixin): STATUSES = ( @@ -96,6 +128,7 @@ class User(AbstractBaseUser, PermissionsMixin): contractor_specializations = TreeManyToManyField(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) + contractor_resume = models.OneToOneField(ContractorResume, 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) diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index 8ae75fa..2a418d7 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -1,7 +1,7 @@ {% extends 'partials/base.html' %} {% load staticfiles %} - +{% load thumbnail %} {% block content %} {% include 'partials/header.html' %} @@ -11,7 +11,9 @@
- profile-image + {% thumbnail contractor.avatar "235x224" crop="center" as im %} + profile-image + {% endthumbnail %}
@@ -23,6 +25,18 @@ +
  • + + редактировать профиль + + +
    • +
  • + + редактировать профиль + + +
    • {% endif %} {% if contractor.pk != user.id %} @@ -225,22 +239,27 @@
    - profile-image + {% thumbnail contractor.avatar "176x160" crop="center" as im %} + profile-image + {% endthumbnail %} +

    {{ user.get_full_name }}

    - скачать резюме + {% if contractor.contractor_resume.resume_file.url %} + скачать резюме + {% endif %}

    - Мужчина, 24 года, {{ user.date_of_birth }} +{# Мужчина, 24 года, {{ user.date_of_birth }}#}

      -
    • brilliantov.me
      • -
    • alex@brilliantov.me
      • -
    • +7 968 009 19 99
      • +
    • {{ contractor.website }}
      • +
    • {{ contractor.email }}
      • +
    • {{ contractor.phone }}
    • Россия, Москва
    @@ -264,16 +283,7 @@
    -
    -

    Что я умею 1?

    - - Lorem ipsum dolor sit amet, consectetur adipisicing elit. -
    -
    -

    Что я умею 2?

    - - Lorem ipsum dolor sit amet, consectetur adipisicing elit. -
    + {{ contractor.contractor_resume.text }}
    @@ -284,6 +294,7 @@
    + {% for diplom in contractor.contractor_resume.resume_files.all %}
    @@ -292,7 +303,7 @@

    - Lorem ipsum dolor sit amet, consectetur adipisicing elit. + {{ diplom.title }}

    @@ -301,24 +312,8 @@
    + {% endfor %} -
    -
    -
    -
    -
    -
    -
    -

    - Lorem ipsum dolor sit amet, consectetur adipisicing elit. -

    -
    -
    - -
    -
    -
    -
    @@ -330,6 +325,7 @@
    + {% for cro in contractor.contractor_resume.resume_files.all %}
    @@ -338,7 +334,7 @@

    - Lorem ipsum dolor sit amet, consectetur adipisicing elit. + {{ cro.title }}

    @@ -347,24 +343,8 @@
    + {% endfor %} -
    -
    -
    -
    -
    -
    -
    -

    - Lorem ipsum dolor sit amet, consectetur adipisicing elit. -

    -
    -
    - -
    -
    -
    -
    diff --git a/users/templates/contractor_profile_edit.html b/users/templates/contractor_profile_edit.html index d2841fc..42413cf 100644 --- a/users/templates/contractor_profile_edit.html +++ b/users/templates/contractor_profile_edit.html @@ -2,7 +2,7 @@ {% load staticfiles %} {% load common_tags %} {% block content %} -{% include 'partials/header2.html' %} +{% include 'partials/header.html' %}
    {% csrf_token %} @@ -13,6 +13,7 @@
    + profile-image
    @@ -130,8 +131,6 @@ + + + + + + + + + + + + + diff --git a/work_sell/urls.py b/work_sell/urls.py index 384e97f..29399e9 100644 --- a/work_sell/urls.py +++ b/work_sell/urls.py @@ -8,6 +8,9 @@ from .views import ( WorkSellDeleteView, UploadView, work_sell_create, + BasicCreateView, + PictureCreateView, + ) app_name = 'work_sell' @@ -19,5 +22,7 @@ urlpatterns = [ urls.url(r'^(?P\d+)/edit/$',WorkSellUpdateView.as_view(), name='edit'), urls.url(r'^(?P\d+)/delete/$',WorkSellDeleteView.as_view(), name='delete'), urls.url(r'^test/$', work_sell_create, name='test'), + urls.url(r'^basic/$', BasicCreateView.as_view(), name='upload-basic'), + urls.url(r'^new/$', PictureCreateView.as_view(), name='upload-new'), urls.url(r'^(?P\d+)/$', WorkSellDetail.as_view(), name='detail'), ] diff --git a/work_sell/views.py b/work_sell/views.py index 53be4a5..f5a8c7b 100644 --- a/work_sell/views.py +++ b/work_sell/views.py @@ -6,8 +6,31 @@ from django.views.generic import ListView, DetailView, CreateView, View,\ UpdateView, DeleteView, TemplateView from projects.models import BuildingClassfication, ConstructionType -from .models import WorkSell +from .models import WorkSell, Picture from .forms import WorkSellForm +from .serialize import serialize +from .response import JSONResponse, response_mimetype + +class PictureCreateView(CreateView): + model = Picture + fields = '__all__' + + def form_valid(self, form): + self.object = form.save() + files = [serialize(self.object)] + data = {'files': files} + response = JSONResponse(data, mimetype=response_mimetype(self.request)) + response['Content-Disposition'] = 'inline; filename=files.json' + return response + + def form_invalid(self, form): + data = json.dumps(form.errors) + return HttpResponse(content=data, status=400, content_type='application/json') + + +class BasicCreateView(PictureCreateView): + template_name = 'picture_basic_form.html' + class WorkSellsView(ListView): model = WorkSell @@ -83,6 +106,8 @@ class UploadView(View): def get(self, request, *args, **kwargs): return render(request,self.template_name) + + class JSONResponseMixin(object): def render_to_json_response(self, context, **response_kwargs): return JsonResponse(