mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

#ARC-15 add position for candidate table

Browse Source
remotes/origin/setup
Mukhtar 10 years ago
parent a44a7e4da9
commit 04e72a96a7
14 changed files with 145 additions and 45 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 2
      archilance/settings/base.py
  2. 20
      chat/migrations/0005_message_is_new.py
  3. 1
      chat/models.py
  4. 2
      chat/views.py
  5. 20
      projects/migrations/0002_candidate_position.py
  6. 20
      projects/migrations/0003_auto_20160812_1512.py
  7. 1
      projects/models.py
  8. 76
      templates/partials/base.html
  9. 10
      templates/registration/registration_form.html
  10. 23
      users/pipeline.py
  11. 3
      users/templates/contractor_office.html
  12. 8
      users/templates/contractor_profile.html
  13. 2
      users/templates/register_social_mail.html
  14. 2
      users/templates/register_social_mail.txt

2
archilance/settings/base.py
Unescape View File

@ -188,7 +188,7 @@ SOCIAL_AUTH_PIPELINE = (
'social.pipeline.social_auth.associate_user', 'social.pipeline.social_auth.associate_user',
'social.pipeline.social_auth.load_extra_data', 'social.pipeline.social_auth.load_extra_data',
'social.pipeline.user.user_details', 'social.pipeline.user.user_details',
'users.pipeline.test_contractor', 'users.pipeline.success_social_register',
) )
FIELDS_STORED_IN_SESSION = ['user_type'] FIELDS_STORED_IN_SESSION = ['user_type']

20
chat/migrations/0005_message_is_new.py
Unescape View File

@ -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),
),
]

1
chat/models.py
Unescape View File

@ -13,6 +13,7 @@ class Message(models.Model):
recipent = models.ForeignKey(User, related_name='recipent_messages') recipent = models.ForeignKey(User, related_name='recipent_messages')
private_type = models.BooleanField(default=False) private_type = models.BooleanField(default=False)
team = models.ForeignKey(Team, related_name='messages', null=True, blank=True) team = models.ForeignKey(Team, related_name='messages', null=True, blank=True)
is_new = models.BooleanField(default=True)
def __str__(self): def __str__(self):
return self.text return self.text

2
chat/views.py
Unescape View File

@ -56,6 +56,8 @@ class ChatUserView(View):
if request.user.is_owner_team(): if request.user.is_owner_team():
team_orders = request.user.team.orders.all() team_orders = request.user.team.orders.all()
else:
team_orders = []
self.template_name = 'chat_contractor.html' self.template_name = 'chat_contractor.html'
return render(request, self.template_name, {'orders': orders, return render(request, self.template_name, {'orders': orders,

20
projects/migrations/0002_candidate_position.py
Unescape View File

@ -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),
),
]

20
projects/migrations/0003_auto_20160812_1512.py
Unescape View File

@ -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),
),
]

1
projects/models.py
Unescape View File

@ -203,6 +203,7 @@ class Candidate(models.Model):
answer = models.ForeignKey(Answer, related_name='candidates') answer = models.ForeignKey(Answer, related_name='candidates')
project = models.ForeignKey(Project, related_name='candidates') project = models.ForeignKey(Project, related_name='candidates')
status = models.BooleanField(default=False) status = models.BooleanField(default=False)
position = models.PositiveIntegerField(default=0)
def __str__(self): def __str__(self):
return self.answer.user.get_full_name() return self.answer.user.get_full_name()

76
templates/partials/base.html
Unescape View File

@ -3,41 +3,43 @@
<!doctype html> <!doctype html>
<html> <html>
<head> <head>
<meta charset='utf-8'> <meta charset='utf-8'>
<meta http-equiv='X-UA-Compatible' content='IE=edge, chrome=1'> <meta http-equiv='X-UA-Compatible' content='IE=edge, chrome=1'>
<meta name='viewport' content='width=device-width, initial-scale=1'> <meta name='viewport' content='width=device-width, initial-scale=1'>
<!--<meta name='viewport' content='initial-scale=1.0, user-scalable=no, maximum-scale=1'>--> <!--<meta name='viewport' content='initial-scale=1.0, user-scalable=no, maximum-scale=1'>-->
<title>Archilance</title> <title>Archilance</title>
{% load compress %} {% load compress %}
{% compress css %} {% compress css %}
<link rel='stylesheet' href='{% static "css/bootstrap.css" %}'> <link rel='stylesheet' href='{% static "css/bootstrap.css" %}'>
<link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'> <link rel='stylesheet' href='{% static "css/font-awesome.min.css" %}'>
<link rel='stylesheet' href='{% static "css/reset.css" %}'> <link rel='stylesheet' href='{% static "css/reset.css" %}'>
<link rel='stylesheet' href='{% static "lib/bootstrap-select/css/bootstrap-select.css" %}'> <link rel='stylesheet' href='{% static "lib/bootstrap-select/css/bootstrap-select.css" %}'>
<link rel='stylesheet' href='{% static "lib/select2/select2.css" %}'> <!-- Tmp --> <link rel='stylesheet' href='{% static "lib/select2/select2.css" %}'> <!-- Tmp -->
<link rel='stylesheet' href='{% static "css/swiper.min.css" %}'> <link rel='stylesheet' href='{% static "css/swiper.min.css" %}'>
<link rel='stylesheet' href='{% static "lib/jquery.fileupload/css/jquery.fileupload.css" %}'> <link rel='stylesheet' href='{% static "lib/jquery.fileupload/css/jquery.fileupload.css" %}'>
<link rel='stylesheet' href='{% static "js/magnific-popup.css" %}'> <link rel='stylesheet' href='{% static "js/magnific-popup.css" %}'>
<link rel="stylesheet" type="text/css" href="//cdnjs.cloudflare.com/ajax/libs/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css" /> <link rel="stylesheet" type="text/css"
href="//cdnjs.cloudflare.com/ajax/libs/jquery-jgrowl/1.4.1/jquery.jgrowl.min.css"/>
<link rel='stylesheet' href='{% static "css/main.css" %}'>
<link rel='stylesheet' href='{% static "css/extra.css" %}'> <!-- Our additional CSS --> <link rel='stylesheet' href='{% static "css/main.css" %}'>
<link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! --> <link rel='stylesheet' href='{% static "css/extra.css" %}'> <!-- Our additional CSS -->
{% endcompress %} <link rel='stylesheet' href='{% static "css/dev-colors.css" %}'> <!-- Dev-time only, temporary!!! -->
{% endcompress %}
</head> </head>
<body> <body>
{% if messages %} {% if messages %}
{% for message in messages %} {% for message in messages %}
<div class="c" style="position: relative; padding: 10px; margin-bottom: 6px; z-index: 100">{{ message|safe }}</div> <div class="c"
style="position: relative; padding: 10px; margin-bottom: 6px; z-index: 100">{{ message|safe }}</div>
{% endfor %} {% endfor %}
{% endif %} {% endif %}
<div style="position: absolute; left: 0; top: 0; padding: 6px; color: black; background-color: #BADA55; z-index: 50"> <div style="position: absolute; left: 0; top: 0; padding: 6px; color: black; background-color: #BADA55; z-index: 50">
{{ request.user }}<br> {{ request.user }}<br>
{% if request.user.is_authenticated %} {% if request.user.is_authenticated %}
<b>PK:</b> {{ request.user.pk }}<br> <b>PK:</b> {{ request.user.pk }}<br>
<b>Groups:</b> {{ request.user.groups.all }} <b>Groups:</b> {{ request.user.groups.all }}
@ -73,8 +75,14 @@
{% endblock %} {% endblock %}
<script type="text/javascript"> <script type="text/javascript">
var SocketHandlerMain = function (userId) { var SocketHandlerMain = function (userId) {
var url = 'ws://127.0.0.1:8888/chat/' + userId + '/'; var domain = '{{ request.META.HTTP_HOST }}';
var port = '{{ request.META.SERVER_PORT }}';
var queryString = '{{ request.get_full_path }}';
if (queryString.indexOf('/chat') != 0) {
domain = domain.replace(':' + port, '');
var url = 'ws://' + domain + ':8888/chat/' + userId + '/';
var sock = new WebSocket(url); var sock = new WebSocket(url);
var intervalId; var intervalId;
sock.onopen = function () { sock.onopen = function () {
@ -88,14 +96,14 @@
var notificationData = JSON.parse(event.data); var notificationData = JSON.parse(event.data);
$.jGrowl("Вам пришло новое сообщение!" + notificationData.msg, {sticky: true}); $.jGrowl("Вам пришло новое сообщение!" + notificationData.msg, {sticky: true});
}; };
} }
$(function () { }
var userId = '{{ request.user.pk }}'; $(function () {
if (userId) { var userId = '{{ request.user.pk }}';
var socketMain = new SocketHandlerMain(userId); if (userId) {
} var socketMain = new SocketHandlerMain(userId);
}); }
});
</script> </script>
</body> </body>
</html> </html>

10
templates/registration/registration_form.html
Unescape View File

@ -17,7 +17,7 @@
{% else %} {% else %}
<div class="col-lg-12 select-reg polsF1"> <div class="col-lg-12 select-reg polsF1">
<select class="selectpicker3" name="group_id"> <select class="selectpicker3" name="group_id">
<option>Выберете вашу роль</option> <option>Выберете вашу роль </option>
<option value="Исполнители">Исполнитель</option> <option value="Исполнители">Исполнитель</option>
<option value="Заказчики">Заказчик</option> <option value="Заказчики">Заказчик</option>
</select> </select>
@ -25,12 +25,12 @@
{% endif %} {% endif %}
</div> </div>
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" class="box-sizing email-reg" <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
placeholder="Nickname"> placeholder="Nickname">
</div> </div>
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="text" name="{{ form.email.name }}" class="box-sizing email-reg" <input type="text" name="{{ form.email.name }}" class="box-sizing email-reg"
placeholder="Электронная почта"> value="{{ form.email.value }}" placeholder="Электронная почта">
</div> </div>
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password1.name }}" class="box-sizing pass-reg" <input type="password" name="{{ form.password1.name }}" class="box-sizing pass-reg"
@ -51,13 +51,13 @@
<div class="btn-group" role="group"> <div class="btn-group" role="group">
<div class="pull-left -social -fb"> <div class="pull-left -social -fb">
<a href="{% url 'social:begin' 'facebook' %}?user_type=contractor"> <a href="{% url 'social:begin' 'facebook' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
<img src="http://nepesh.com/static/img/social/fb.png" alt="fb"> <img src="http://nepesh.com/static/img/social/fb.png" alt="fb">
</a> </a>
</div> </div>
<div class="pull-left -social -tw"> <div class="pull-left -social -tw">
<a href="{% url 'social:begin' 'twitter' %}?user_type=contractor"> <a href="{% url 'social:begin' 'twitter' %}?user_type={% if request.GET.type == 'customer' %}Заказчики{% else %}Исполнители{% endif %}">
<img src="http://nepesh.com/static/img/social/tw.png" alt="tw"> <img src="http://nepesh.com/static/img/social/tw.png" alt="tw">
</a> </a>
</div> </div>

23
users/pipeline.py
Unescape View File

@ -1,18 +1,37 @@
from django.shortcuts import redirect, render_to_response 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 social.pipeline.partial import partial
from django.contrib.auth.models import Group from django.contrib.auth.models import Group
from users.models import ContractorResume 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 @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: if is_new:
group_name = 'Исполнители' group_name = backend.strategy.session_get('user_type')
# group_name = 'Исполнители'
g = Group.objects.get(name=group_name) g = Group.objects.get(name=group_name)
g.user_set.add(user) g.user_set.add(user)
if group_name == 'Исполнители': if group_name == 'Исполнители':
resume = ContractorResume.objects.create(text='Здесь должна быть описание вашего резюме') resume = ContractorResume.objects.create(text='Здесь должна быть описание вашего резюме')
user.contractor_resume = resume user.contractor_resume = resume
user.save() user.save()
#Отправка письма на почту
send_user_mail(user)
@partial @partial
def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs): def add_email_for_user(backend, details, response, is_new=False, *args, **kwargs):

3
users/templates/contractor_office.html
Unescape View File

@ -89,7 +89,7 @@
</div> </div>
</div> </div>
</div> </div>
{% if contractor.is_owner_team %}
<div class="projectsBlock disTab"> <div class="projectsBlock disTab">
<div class="col-lg-12"> <div class="col-lg-12">
<div class="col-lg-3 divCol3"> <div class="col-lg-3 divCol3">
@ -276,6 +276,7 @@
</div> </div>
</div> </div>
{% endif %}
{% include 'partials/footer.html' %} {% include 'partials/footer.html' %}
</div> </div>
</div> </div>

8
users/templates/contractor_profile.html
Unescape View File

@ -271,12 +271,13 @@
<div class="col-lg-9"> <div class="col-lg-9">
<div class="top-summary"> <div class="top-summary">
<p class="name-summ">{{ user.get_full_name }}</p> <p class="name-summ">{{ user.get_full_name }}</p>
<div id="resume-success"></div>
{% if contractor.contractor_resume.resume_file %} {% if contractor.contractor_resume.resume_file %}
<a href="{{ contractor.contractor_resume.resume_file.url }}" <a style="display:{% if contractor.contractor_resume.resume_file %}block{% else %}none{% endif %};"href="{% if contractor.contractor_resume.resume_file %}{{ contractor.contractor_resume.resume_file.url }}{% endif %}"
class="download-summ">скачать резюме</a> class="download-summ">скачать резюме</a>
{% endif %} {% endif %}
<p class="who-summ"> <p class="who-summ">
{# Мужчина, 24 года, {{ user.date_of_birth }}#} Мужчина, 24 года, {{ user.date_of_birth }}#}
</p> </p>
<div class="list-summ-block"> <div class="list-summ-block">
<div class="col-lg-4"> <div class="col-lg-4">
@ -557,6 +558,7 @@
var csrftoken = $.cookie('csrftoken'); var csrftoken = $.cookie('csrftoken');
$("#upload-resume").on('change',function(e){ $("#upload-resume").on('change',function(e){
$("#resume-success").html("");
var formData = new FormData($(this).closest("form")); var formData = new FormData($(this).closest("form"));
formData.append('resume_file', e.target.files[0]); formData.append('resume_file', e.target.files[0]);
console.log(formData); console.log(formData);
@ -573,6 +575,8 @@
processData: false, processData: false,
contentType: false, contentType: false,
success: function(data){ success: function(data){
$("#resume-success").html("Файл для резюме успешно загружен!");
$(".download-summ").css('display','block').attr('href',data.resume_file);
console.log(data); console.log(data);
}, },
error: function(jqXHR){ error: function(jqXHR){

2
users/templates/register_social_mail.html
Unescape View File

@ -0,0 +1,2 @@
Регистрация через соцсети
{{ user.username }}

2
users/templates/register_social_mail.txt
Unescape View File

@ -0,0 +1,2 @@
Регистрация через соцсети
{{ user.username }}
Write Preview
Loading…
Cancel
Save