diff --git a/archilance/settings/base.py b/archilance/settings/base.py index 2c76934..eb857a0 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -188,7 +188,7 @@ SOCIAL_AUTH_PIPELINE = ( 'social.pipeline.social_auth.associate_user', 'social.pipeline.social_auth.load_extra_data', 'social.pipeline.user.user_details', - 'users.pipeline.test_contractor', + 'users.pipeline.success_social_register', ) FIELDS_STORED_IN_SESSION = ['user_type'] diff --git a/chat/migrations/0005_message_is_new.py b/chat/migrations/0005_message_is_new.py new file mode 100644 index 0000000..16ff70b --- /dev/null +++ b/chat/migrations/0005_message_is_new.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 12:08 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('chat', '0004_auto_20160804_1806'), + ] + + operations = [ + migrations.AddField( + model_name='message', + name='is_new', + field=models.BooleanField(default=True), + ), + ] diff --git a/chat/models.py b/chat/models.py index 4a52622..dbd9eb2 100644 --- a/chat/models.py +++ b/chat/models.py @@ -13,6 +13,7 @@ class Message(models.Model): recipent = models.ForeignKey(User, related_name='recipent_messages') private_type = models.BooleanField(default=False) team = models.ForeignKey(Team, related_name='messages', null=True, blank=True) + is_new = models.BooleanField(default=True) def __str__(self): return self.text diff --git a/chat/views.py b/chat/views.py index 5edab5e..7dfb274 100644 --- a/chat/views.py +++ b/chat/views.py @@ -56,6 +56,8 @@ class ChatUserView(View): if request.user.is_owner_team(): team_orders = request.user.team.orders.all() + else: + team_orders = [] self.template_name = 'chat_contractor.html' return render(request, self.template_name, {'orders': orders, diff --git a/projects/migrations/0002_candidate_position.py b/projects/migrations/0002_candidate_position.py new file mode 100644 index 0000000..974aa8a --- /dev/null +++ b/projects/migrations/0002_candidate_position.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 12:11 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0001_squashed_0015_merge'), + ] + + operations = [ + migrations.AddField( + model_name='candidate', + name='position', + field=models.PositiveIntegerField(default=0, max_length=10), + ), + ] diff --git a/projects/migrations/0003_auto_20160812_1512.py b/projects/migrations/0003_auto_20160812_1512.py new file mode 100644 index 0000000..b7bd915 --- /dev/null +++ b/projects/migrations/0003_auto_20160812_1512.py @@ -0,0 +1,20 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-12 12:12 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0002_candidate_position'), + ] + + operations = [ + migrations.AlterField( + model_name='candidate', + name='position', + field=models.PositiveIntegerField(default=0), + ), + ] diff --git a/projects/models.py b/projects/models.py index dd83ce5..1364903 100644 --- a/projects/models.py +++ b/projects/models.py @@ -203,6 +203,7 @@ class Candidate(models.Model): answer = models.ForeignKey(Answer, related_name='candidates') project = models.ForeignKey(Project, related_name='candidates') status = models.BooleanField(default=False) + position = models.PositiveIntegerField(default=0) def __str__(self): return self.answer.user.get_full_name() diff --git a/templates/partials/base.html b/templates/partials/base.html index d2f8708..546267c 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -3,41 +3,43 @@ - - - - - -Archilance -{% load compress %} - -{% compress css %} - - - - - - - - - - - - - -{% endcompress %} + + + + + + Archilance + {% load compress %} + + {% compress css %} + + + + + + + + + + + + + + {% endcompress %} {% if messages %} {% for message in messages %} -
{{ message|safe }}
+
{{ message|safe }}
{% endfor %} {% endif %}
{{ request.user }}
- + {% if request.user.is_authenticated %} PK: {{ request.user.pk }}
Groups: {{ request.user.groups.all }} @@ -73,8 +75,14 @@ {% endblock %} diff --git a/templates/registration/registration_form.html b/templates/registration/registration_form.html index dc7dfbb..373df04 100644 --- a/templates/registration/registration_form.html +++ b/templates/registration/registration_form.html @@ -17,7 +17,7 @@ {% else %}
@@ -25,12 +25,12 @@ {% endif %}
-
+ value="{{ form.email.value }}" placeholder="Электронная почта">
- + fb
- + tw
diff --git a/users/pipeline.py b/users/pipeline.py index e181e8b..ddd79c6 100644 --- a/users/pipeline.py +++ b/users/pipeline.py @@ -1,18 +1,37 @@ from django.shortcuts import redirect, render_to_response +from django.core.mail import EmailMultiAlternatives +from django.template.loader import get_template, render_to_string from social.pipeline.partial import partial from django.contrib.auth.models import Group from users.models import ContractorResume + +def send_user_mail(user): + ctx_dict = { + 'user': user, + } + subject, from_email, to = 'Регистрация черз социальные сети', 'mukhtar@mukhtar', user.email + text_content = render_to_string('register_social_mail.txt', ctx_dict) + html_content = get_template('register_social_mail.html').render(ctx_dict) + msg = EmailMultiAlternatives(subject, text_content, from_email, [to]) + msg.attach_alternative(html_content, "text/html") + msg.send() + + @partial -def test_contractor(backend, details, response, user,is_new=False, *args, **kwargs): +def success_social_register(backend, details, response, user,is_new=False, *args, **kwargs): if is_new: - group_name = 'Исполнители' + group_name = backend.strategy.session_get('user_type') + # group_name = 'Исполнители' g = Group.objects.get(name=group_name) g.user_set.add(user) if group_name == 'Исполнители': resume = ContractorResume.objects.create(text='Здесь должна быть описание вашего резюме') user.contractor_resume = resume user.save() + #Отправка письма на почту + send_user_mail(user) + @partial def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs): diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 4b495d7..22a8955 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -89,7 +89,7 @@
- +{% if contractor.is_owner_team %}
@@ -276,6 +276,7 @@
+ {% endif %} {% include 'partials/footer.html' %}
diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index b77f72a..1b2d16a 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -271,12 +271,13 @@

{{ user.get_full_name }}

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

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

@@ -557,6 +558,7 @@ var csrftoken = $.cookie('csrftoken'); $("#upload-resume").on('change',function(e){ + $("#resume-success").html(""); var formData = new FormData($(this).closest("form")); formData.append('resume_file', e.target.files[0]); console.log(formData); @@ -573,6 +575,8 @@ processData: false, contentType: false, success: function(data){ + $("#resume-success").html("Файл для резюме успешно загружен!"); + $(".download-summ").css('display','block').attr('href',data.resume_file); console.log(data); }, error: function(jqXHR){ diff --git a/users/templates/register_social_mail.html b/users/templates/register_social_mail.html new file mode 100644 index 0000000..7f6b129 --- /dev/null +++ b/users/templates/register_social_mail.html @@ -0,0 +1,2 @@ +Регистрация через соцсети +{{ user.username }} diff --git a/users/templates/register_social_mail.txt b/users/templates/register_social_mail.txt new file mode 100644 index 0000000..7f6b129 --- /dev/null +++ b/users/templates/register_social_mail.txt @@ -0,0 +1,2 @@ +Регистрация через соцсети +{{ user.username }}