From a8f2cc350c432f94a9cce209bbdd298ae93fe0ed Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Tue, 6 Sep 2016 22:40:36 +0300 Subject: [PATCH 1/3] #ARC-4 Section 7 --- assets/index.js | 37 +++++++++++++++++++ assets/js/chat.js | 2 +- common/migrations/0014_auto_20160906_1713.py | 19 ++++++++++ common/views.py | 2 +- templates/partials/base.html | 2 +- templates/test.html | 10 +---- users/filters.py | 23 +++++++++++- users/models.py | 3 ++ users/serializers.py | 3 ++ users/templates/contractor_office.html | 32 +++++++++++++++- users/templates/contractor_profile.html | 32 ++++++++-------- .../partials/modals/add_team_member.html | 19 ++++++++++ users/urls.py | 5 ++- users/views.py | 12 ++++++ 14 files changed, 170 insertions(+), 31 deletions(-) create mode 100644 common/migrations/0014_auto_20160906_1713.py create mode 100644 users/templates/partials/modals/add_team_member.html diff --git a/assets/index.js b/assets/index.js index eb6b5ec..12a62af 100644 --- a/assets/index.js +++ b/assets/index.js @@ -196,6 +196,43 @@ function initSimpleSpecSelect2($select, specId) { +// Team invitation contractor select ------------------------------- + + +var contractorSelectOptions = { + language: 'ru', + placeholder: 'Выберите пользователя', // Required by `allowClear` + allowClear: true, +} + +function initContractorSelect($select) { + return $.ajax({url: '/api/users/?is_contractor=true', method: 'GET', dataType: 'json'}) + .then(function(res) { + var contractors = res.results + + $select.select2(_.merge(contractorSelectOptions, { + data: _.map(function(contractor) { + return { + id: contractor.id, + text: contractor.username, + origItem: contractor, + } + }, contractors), + })) + }) +} + + + + + + + + + + + + // Location select ---------------------------------------------- diff --git a/assets/js/chat.js b/assets/js/chat.js index f38847e..320f51c 100644 --- a/assets/js/chat.js +++ b/assets/js/chat.js @@ -1,6 +1,6 @@ var SocketHandler = function () { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + '/chat/' + userId + '/'; + var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { diff --git a/common/migrations/0014_auto_20160906_1713.py b/common/migrations/0014_auto_20160906_1713.py new file mode 100644 index 0000000..b71874c --- /dev/null +++ b/common/migrations/0014_auto_20160906_1713.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-06 14:13 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('common', '0013_liveimageupload'), + ] + + operations = [ + migrations.AlterModelOptions( + name='liveimageupload', + options={'verbose_name': 'Живая загрузка изображений', 'verbose_name_plural': 'Живая загрузка изображений'}, + ), + ] diff --git a/common/views.py b/common/views.py index ca08433..7dce5a1 100644 --- a/common/views.py +++ b/common/views.py @@ -111,7 +111,7 @@ class LiveImageUploadDeleteView(NoCsrfMixin, LoginRequiredMixin, View): live_img.delete() return JsonResponse({'status': 'success'}) else: - return JsonResponse({'status': 'failure'}) + return JsonResponse({'status': 'error'}) class CustomRegistrationView(RegistrationView): diff --git a/templates/partials/base.html b/templates/partials/base.html index 4c32a99..6d947d1 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -87,7 +87,7 @@ if ((queryString.indexOf('/chat') != 0) && (queryString.indexOf('/users/contractor-office/510/work-projects') != 0)) { domain = domain.replace(':' + port, ''); - var url = 'ws://' + domain + '/chat/' + userId + '/'; + var url = 'ws://' + domain + ':8888/chat/' + userId + '/'; var sock = new WebSocket(url); var intervalId; sock.onopen = function () { diff --git a/templates/test.html b/templates/test.html index fe6da23..b09ae45 100644 --- a/templates/test.html +++ b/templates/test.html @@ -15,7 +15,7 @@
- Hello there + {{ request.get_host }}{{ request.get_full_path }}
@@ -26,13 +26,5 @@ - - diff --git a/users/filters.py b/users/filters.py index 6c6d611..7969b44 100755 --- a/users/filters.py +++ b/users/filters.py @@ -1,23 +1,41 @@ -from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter +from rest_framework_filters import FilterSet, RelatedFilter, AllLookupsFilter, MethodFilter +import pydash as _; _.map = _.map_; _.filter = _.filter_ + from .models import User, Team, ContractorResumeFiles, ContractorResume class UserFilterSet(FilterSet): - id = AllLookupsFilter() email = AllLookupsFilter() first_name = AllLookupsFilter() + id = AllLookupsFilter() is_active = AllLookupsFilter() is_admin = AllLookupsFilter() + is_contractor = MethodFilter() + is_customer = MethodFilter() last_name = AllLookupsFilter() + projects = RelatedFilter('projects.filters.ProjectFilterSet') class Meta: model = User + + def filter_is_contractor(self, name, qs, value): + if value == 'true': + return _.filter(qs, lambda user: user.is_contractor()) + + return qs + + def filter_is_customer(self, name, qs, value): + if value == 'true': + return _.filter(qs, lambda user: user.is_customer()) + + return qs class TeamFilterSet(FilterSet): id = AllLookupsFilter() name = AllLookupsFilter() + owner = RelatedFilter('users.filters.UserFilterSet') class Meta: @@ -37,6 +55,7 @@ class ContractorResumeFilesFilterSet(FilterSet): id = AllLookupsFilter() title = AllLookupsFilter() img = AllLookupsFilter() + resume = RelatedFilter('users.filters.ContractorResumeFilterSet') class Meta: diff --git a/users/models.py b/users/models.py index 391f71c..00a9b76 100644 --- a/users/models.py +++ b/users/models.py @@ -212,6 +212,9 @@ class User(AbstractBaseUser, PermissionsMixin): def is_customer(self): return self.groups.filter(name='Заказчики').exists() + def has_team(self): + return self.is_contractor() and bool(util.get_related_or_none(self, 'team')) + def is_owner_profile(self, user_id): pass diff --git a/users/serializers.py b/users/serializers.py index 96df7b4..c618117 100755 --- a/users/serializers.py +++ b/users/serializers.py @@ -51,8 +51,11 @@ class UserSerializer(ModelSerializer): 'financial_info', 'first_name', 'gender', + 'has_team', 'id', 'is_active', + 'is_contractor', + 'is_customer', 'last_name', 'last_time_visit', 'location', diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index ade5edf..716c0fa 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -5,6 +5,7 @@ {% block content %} + {% include 'partials/modals/add_team_member.html' %} {% include 'partials/header.html' %}
@@ -75,7 +76,7 @@
- + добавить участника @@ -326,6 +327,35 @@ window.loadMorePortfolios = loadMorePortfolios window.loadMoreWorkSells = loadMoreWorkSells + + + + // Add new team member -------------------------------------------- + + + {% if request.user.has_team %} + var $contractorSelect = window.$contractorSelect = $('.-contractor-select').first() + var $addTeamMemberModal = $('#addTeamMemberModal') +{# var addTeamMemberUrl = '/users/add-team-member/%id%/'#} + + initContractorSelect($contractorSelect) + + $addTeamMemberModal.find('.-action-button').first().on('click', function($evt) { + $addTeamMemberModal.modal('hide') + + socketMain.add_message({ + format_type: 'add_message_contact', + + data: { + sender_id: {{ request.user.pk }}, + recipent_id: $contractorSelect.select2('val'), + chat_message: 'Приглашаю в группу http://{{ request.get_host }}{% url 'users:team-profile' pk=request.user.team.pk %}', + }, + }) + + $.jGrowl('Приглашение успешно отправлено') + }) + {% endif %} }()) {% endblock %} diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index bfd5664..dccfae9 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -32,9 +32,9 @@ {% endif %} - {% if contractor.pk != request.user.pk and request.user.is_contractor %} + {% if contractor.pk != request.user.pk and request.user.is_contractor and request.user.has_team %}
  • - + пригласить в группу @@ -776,20 +776,22 @@ // Team invitation ----------------------------------------------- - function inviteToTeam(msg) { - socketMain.add_message({ - format_type: 'add_message_contact', - - data: { - sender_id: {{ request.user.pk }}, - recipent_id: {{ contractor.pk }}, - chat_message: msg, - }, + {% if contractor.pk != request.user.pk and request.user.is_contractor and request.user.has_team %} + $('.-team-invitation').first().on('click', function($evt) { + socketMain.add_message({ + format_type: 'add_message_contact', + + data: { + sender_id: {{ request.user.pk }}, + recipent_id: {{ contractor.pk }}, + chat_message: 'Приглашаю в группу http://{{ request.get_host }}{% url 'users:team-profile' pk=request.user.team.pk %}', + }, + }) + + $.jGrowl('Приглашение успешно отправлено') + $(this).fadeOut() }) - } - - window.inviteToTeam = inviteToTeam - + {% endif %} //----------------------------------------------------------------- diff --git a/users/templates/partials/modals/add_team_member.html b/users/templates/partials/modals/add_team_member.html new file mode 100644 index 0000000..f106f37 --- /dev/null +++ b/users/templates/partials/modals/add_team_member.html @@ -0,0 +1,19 @@ + diff --git a/users/urls.py b/users/urls.py index df5c2c3..d7e8021 100755 --- a/users/urls.py +++ b/users/urls.py @@ -3,7 +3,9 @@ from django.conf.urls import include from django.contrib.auth.views import login, logout from .views import ( + AddTeamMember, contractor_resumefile_create, + ContractorChatProjectsView, ContractorFilterView, ContractorOfficeProjectsView, ContractorOfficeView, @@ -17,7 +19,6 @@ from .views import ( TeamProfileView, UserFinancialInfoEditView, UserProfileEditView, - ContractorChatProjectsView, ) @@ -42,4 +43,6 @@ urlpatterns = [ urls.url(r'^teams/(?P\d+)/$', TeamProfileView.as_view(), name='team-profile'), urls.url(r'^contractor-office/(?P\d+)/work-projects/$', ContractorChatProjectsView.as_view(), name='contractor-office-chat-projects'), + + urls.url(r'^add-team-member/(?P\d+)/$', AddTeamMember.as_view(), name='add-team-member'), ] diff --git a/users/views.py b/users/views.py index df940db..d6d2d3e 100644 --- a/users/views.py +++ b/users/views.py @@ -1,5 +1,7 @@ +from common.mixins import NoCsrfMixin from django.conf import settings from django.contrib import messages +from django.contrib.auth.mixins import LoginRequiredMixin from django.core.exceptions import PermissionDenied from django.core.files.base import ContentFile from django.core.mail import send_mail @@ -722,5 +724,15 @@ class CustomerProfileReviewsView(BaseMixin, View): return render(request, self.template_name, context) +class AddTeamMember(NoCsrfMixin, LoginRequiredMixin, View): + def post(self, request, *args, **kwargs): + # import code; code.interact(local=dict(globals(), **locals())) + + # if request.user.is_contractor()... + # kwargs.get('pk') + # + + return JsonResponse({'status': 'success'}) + # import code; code.interact(local=dict(globals(), **locals())) From 0fe4caa82ca7e9dd56f77c94b9ff1467887d429b Mon Sep 17 00:00:00 2001 From: PekopT Date: Wed, 7 Sep 2016 13:13:13 +0300 Subject: [PATCH 2/3] chat port --- chat/settings.example.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/chat/settings.example.py b/chat/settings.example.py index c846c65..1878ce8 100644 --- a/chat/settings.example.py +++ b/chat/settings.example.py @@ -1,6 +1,6 @@ import os -PORT = 8888 +PORT = 8889 settings = { 'cookie_secret': '__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__', From 7f390f2ea5de99593cd2cf650f53a630c95d4b65 Mon Sep 17 00:00:00 2001 From: Seghey Shishman Date: Wed, 7 Sep 2016 13:49:39 +0300 Subject: [PATCH 3/3] css edited --- assets/css/main.css | 3 +++ 1 file changed, 3 insertions(+) diff --git a/assets/css/main.css b/assets/css/main.css index 5cf15b5..0445a58 100644 --- a/assets/css/main.css +++ b/assets/css/main.css @@ -5962,4 +5962,7 @@ a.linkS2[data-target="#withdraw-money"]{ border-radius: 50px; border: 1px solid #42B476; } +.laladsd{ + color: inherit; +} /*end_new*/ \ No newline at end of file