Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar

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*/

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 ----------------------------------------------
 

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 () {

chat/settings.example.py

@@ -1,6 +1,6 @@
 import os
 
-PORT = 8888
+PORT = 8889
 
 settings = {
     'cookie_secret': '__TODO:_GENERATE_YOUR_OWN_RANDOM_VALUE_HERE__',

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': 'Живая загрузка изображений'},
+        ),
+    ]

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):

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 () {

templates/test.html

@@ -15,7 +15,7 @@
     <div class='container-fluid'>
         <div class='row'>
             <div class='col-xs-12' style='margin-top: 15px'>
-                <span data-tooltip data-placement="bottom" title="{% tooltip name='Test' %}">Hello there</span>
+                {{ request.get_host }}{{ request.get_full_path }}
             </div>
         </div>
     </div>
@@ -26,13 +26,5 @@
     <script src='{% static "js/bootstrap.min.js" %}'></script>
     
     <script src='{% static "my-libs.js" %}'></script>
-    
-    <script>
-        $('[data-tooltip]').tooltip({
-            html: true,
-            container: 'body', // Remove unwanted side-effects
-            trigger : 'hover', // Disable tooltip remaining visible after a click
-        })
-    </script>
 </body>
 </html>

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:

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
 

users/serializers.py

@@ -52,8 +52,11 @@ class UserSerializer(ModelSerializer):
             'financial_info',
             'first_name',
             'gender',
+            'has_team',
             'id',
             'is_active',
+            'is_contractor',
+            'is_customer',
             'last_name',
             'last_time_visit',
             'location',

users/templates/contractor_office.html

@@ -5,6 +5,7 @@
 
 
 {% block content %}
+    {% include 'partials/modals/add_team_member.html' %}
     {% include 'partials/header.html' %}
     
     <div class="container mainScore">
@@ -75,7 +76,7 @@
                             </div>
     
                             <div class="menuUser disTab">
-                                <a href="{% url 'users:contractor-filter' %}" class="add-man">
+                                <a href="#" onclick="return false" data-toggle="modal" data-target="#addTeamMemberModal" class="add-man -add-team-member">
                                     добавить участника
                                 </a>
     
@@ -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 %}
         }())
     </script>
 {% endblock %}

users/templates/contractor_profile.html

@@ -32,9 +32,9 @@
                                 </li>
                             {% 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 %}
                                 <li class="icon_um2">
-                                    <a href="javascript:void(0)">
+                                    <a href="#" onclick="return false" class='-team-invitation'>
                                         пригласить в группу
                                     </a>
                                     <span></span>
@@ -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 %}
             
             
             //-----------------------------------------------------------------

users/templates/partials/modals/add_team_member.html

@@ -0,0 +1,19 @@
+<div class="modal fade" id="addTeamMemberModal" tabindex="-1">
+    <div class="modal-dialog" role="document">
+        <div class="modal-content">
+            <div class="modal-header">
+                <button type="button" class="close" data-dismiss="modal"><span>&times;</span></button>
+                <h4 class="modal-title" id="myModalLabel">Modal title</h4>
+            </div>
+            
+            <div class="modal-body">
+                <input type="hidden" class="-contractor-select" style="width: 100%">
+            </div>
+            
+            <div class="modal-footer">
+                <button type="button" class="btn btn-default" data-dismiss="modal">Отмена</button>
+                <button type="button" class="btn btn-primary -action-button">Пригласить</button>
+            </div>
+        </div>
+    </div>
+</div>

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<pk>\d+)/$', TeamProfileView.as_view(), name='team-profile'),
     urls.url(r'^contractor-office/(?P<pk>\d+)/work-projects/$', ContractorChatProjectsView.as_view(), name='contractor-office-chat-projects'),
+    
+    urls.url(r'^add-team-member/(?P<pk>\d+)/$', AddTeamMember.as_view(), name='add-team-member'),
 ]

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()))