Merge remote-tracking branch 'origin/master'

api/urls.py

@@ -8,6 +8,7 @@ from .views import (
     LocationViewSet,
     MessageViewSet,
     NoteViewSet,
+    OrderViewSet,
     PortfolioPhotoViewSet,
     PortfolioViewSet,
     ProjectViewSet,
@@ -17,7 +18,6 @@ from .views import (
     StageViewSet,
     TeamViewSet,
     UserViewSet,
-    OrderViewSet,
 )
 
 
@@ -30,10 +30,10 @@ router.register(r'documents', DocumentViewSet)
 router.register(r'locations', LocationViewSet)
 router.register(r'message', MessageViewSet)
 router.register(r'note', NoteViewSet)
+router.register(r'orders', OrderViewSet)
 router.register(r'portfolio-photos', PortfolioPhotoViewSet)
 router.register(r'portfolios', PortfolioViewSet)
 router.register(r'projects', ProjectViewSet)
-router.register(r'orders', OrderViewSet)
 router.register(r'realties', RealtyViewSet)
 router.register(r'reviews', ReviewViewSet)
 router.register(r'specializations', SpecializationViewSet)

archilance/management/commands/generate_projects.py

@@ -78,7 +78,7 @@ class Command(BaseCommand):
                 project=project,
                 contractor=_.sample((None, User.contractor_objects.order_by('?').first())),
                 secure=_.sample((True, False)),
-                status=_.sample((True, False)),
+                status=_.sample(Order.STATUSES)[0],
             )
             
             return project

archilance/util.py

@@ -1,4 +1,5 @@
 from django.core import validators
+from django.core.exceptions import ObjectDoesNotExist
 from django.shortcuts import _get_queryset
 from django.utils import timezone
 from pprint import pprint, pformat
@@ -54,6 +55,15 @@ def get_or_none(klass, *args, **kwargs):
         return None
 
 
+def get_related_or_none(obj, attr):
+    try:
+        rel = getattr(obj, attr)
+    except ObjectDoesNotExist:
+        rel = None
+    
+    return rel
+
+
 def get_attr_or_none(klass, *args, attr=None, **kwargs):
     object = get_or_none(klass, *args, **kwargs)
     

assets/css/main.css

@@ -5524,7 +5524,7 @@ input[type="radio"]:checked + span {
     width: 216px;
 }
 .proj_answ_form .textAreaBlock2 input[name="term"]{
-    width: 262px;
+    width: 258px;
 }
 .proj_answ_form .textAreaBlock2 p span{
     position: absolute;
@@ -5759,7 +5759,7 @@ input[type="radio"]:checked + span {
     margin-bottom: 0 !important
 }
 .infoProfile .dropdown-menu{
-    height: 316px;
+    height: auto;
 }
 .form-regestration{
     padding: 20px 0 40px 0;
@@ -5819,4 +5819,46 @@ input[type="radio"]:checked + span {
     text-transform: initial;
     letter-spacing: normal;
 }
+.fr_answer{
+    width: 100%;
+    height: 110px;
+    border: 1px solid #cdcdcd;
+    resize: none;
+    padding: 10px 15px;
+    color: #3c1a06;
+    font-family: 'Arial-MT-Regular', sans-serif;
+    font-size: 14px;
+    float: left;
+    margin: 0px 0px 0px 55px;
+}
+.fr_answer_sen{
+    float: left;
+    border-radius: 40px;
+    font-family: 'pfdintextcomppro-regular', sans-serif;
+    letter-spacing: 2px;
+    color: #373737;
+    margin: 20px 0 0 55px;
+    font-size: 15px;
+    border: 1px solid #BEBEBE;
+    padding: 17px 46px;
+    text-transform: uppercase;
+}
+.fa-pencil:before, .fa-times:before{
+    color: #fff;
+}
+.mainMenu li.active > a {
+    border-color: #ff0029;
+}
+.mainMenu li.icon_tm1.active span{
+    background: url('../img/listMain2.png') no-repeat !important;
+}
+.mainMenu li.officeList.active span {
+    background: url('../img/list4tml.png') no-repeat center !important;
+}
+.mainMenu li.icon_tm2.active span{
+    background: url('../img/listMain2.png') no-repeat center !important;
+}
+.mainMenu li.icon_tm3.active span{
+    background: url('../img/listMain2.png') no-repeat right !important;
+}
 /*end_new*/

projects/models.py

@@ -204,12 +204,13 @@ class Order(models.Model):
         ('process', 'В процессе'),
         ('completed', 'Завершен'),
     )
-    contractor = models.ForeignKey(User, null=True, blank=True, related_name='orders')
+    
-    team = models.ForeignKey(Team, null=True, blank=True, related_name='orders')
+    contractor = models.ForeignKey(User, null=True, blank=True, related_name='orders') # Related name should've been "contractor_orders"
     created = models.DateTimeField(default=timezone.now)
     project = models.OneToOneField(Project, related_name='order')
     secure = models.BooleanField(default=False)
     status = models.CharField(max_length=30, choices=STATUSES, default='created')
+    team = models.ForeignKey(Team, null=True, blank=True, related_name='orders')
     
     def __str__(self):
         return self.project.name

projects/templates/project_detail.html

@@ -313,8 +313,8 @@
                                             {% csrf_token %}
                                             <input type="hidden" name="next" value="{% url 'projects:detail' pk=project.pk %}">
                                             
-                                            <div><textarea name="text"></textarea></div>
+                                            <div><textarea name="text" class="fr_answer"></textarea></div>
-                                            <div><button type="submit">Отправить</button></div>
+                                            <div><button type="submit" class="fr_answer_sen">Отправить</button></div>
                                         </form>
                                     </div>
                                 </div>

projects/views.py

@@ -59,8 +59,7 @@ class ProjectDetailWithAnswerView(BaseMixin, View):
             answer = _.first(_.filter(project_answers, lambda a: a.author == contractor))
 
             if not answer:
-                try: team = contractor.team
+                team = util.get_related_or_none(contractor, 'team')
-                except Team.DoesNotExist: team = None
 
                 if team:
                     answer = _.first(_.filter(project_answers, lambda a: a.author == team))
@@ -68,8 +67,10 @@ class ProjectDetailWithAnswerView(BaseMixin, View):
             context.update({'answer': answer})
 
             if not answer:
-                try: contractor.team; context.update({'can_answer_as_team': True})
+                team = util.get_related_or_none(contractor, 'team')
-                except Team.DoesNotExist: pass
+                
+                if team:
+                    context.update({'can_answer_as_team': True})
 
                 if request.GET.get('answer_as_team') == 'on':
                     context.update({'answer_as_team': True})
@@ -154,8 +155,7 @@ class ProjectAnswerCreateMessageView(BaseMixin, View):
                 if isinstance(answer.author, User) and answer.author == request.user:
                     message.contractor_or_team = request.user
                 elif isinstance(answer.author, Team):
-                    try: team = request.user.team
+                    team = util.get_related_or_none(request.user, 'team')
-                    except Team.DoesNotExist: team = None
 
                     if team and answer.author == team:
                         message.contractor_or_team = team

users/models.py

@@ -147,11 +147,11 @@ class User(AbstractBaseUser, PermissionsMixin):
         if self.location:
             if self.location.level == 3:
                 return self.location.parent.parent.name +  ', ' + self.location.name
-            else:
+            elif self.location.level == 2:
-                return None
+                return self.location.parent.name +  ', ' + self.location.name
-        else:
+            elif self.location.level == 1:
-            return None
+                return self.location.name
-
+    
     @property
     def is_staff(self):
         return self.is_superuser

users/templates/contractor_filter.html

@@ -42,7 +42,7 @@
                         </div>
                         
                         
-                        <div class="searchF1 polsF1 polsFF polsF3">
+                        <div class="searchF1 polsF1 polsFF polsF3 resSearchF1">
                             <div class="col-lg-3">
                                 <a href="#" class="findReal" onclick="$(this).closest('form').submit(); return false">
                                     найти исполнителя

users/templates/contractor_office.html

@@ -17,12 +17,12 @@
             
             <div class="buttonGP disTab">
                 <div class="btn-group valProject2 val-pro3" role="group">
-                    <button type="button" class="btn btn-default">
+                    {% if contractor.team %}
-                        {{ contractor.team.name }}
+                        <button type="button" class="btn btn-default">
-                        <span><mark>0</mark></span>
+                            {{ contractor.team.name }}
-                    </button>
+                            <span><mark>0</mark></span>
-
+                        </button>
-                    {% if not contractor.is_owner_team %}
+                    {% else %}
                         <button type="button" class="btn btn-default add-group" data-toggle="modal" data-target="#myModal">
                             + Добавить группу
                         </button>
@@ -58,7 +58,7 @@
                 </div>
             </div>
             
-            {% if contractor.is_owner_team %}
+            {% if contractor.team %}
                 <div class="projectsBlock disTab">
                     <div class="col-lg-12">
                         <div class="col-lg-3 divCol3">
@@ -82,11 +82,11 @@
                                 <div class="block-users">
                                     <p>Состав группы</p>
     
-                                    {% for p in participants %}
+                                    {% for c in team_members %}
                                         <div class="message-new">
                                             <div class="imgMess">
-                                                {% if p.avatar %}
+                                                {% if c.avatar %}
-                                                    {% thumbnail p.avatar "60x60" crop="center" as im %}
+                                                    {% thumbnail c.avatar "60x60" crop="center" as im %}
                                                         <img src="{{ im.url }}" alt="mess-image">
                                                     {% endthumbnail %}
                                                 {% else %}
@@ -95,10 +95,10 @@
                                             </div>
     
                                             <p class="nameMess" style="float: none">
-                                                <a href="{% url 'users:contractor-profile' p.pk %}">{{ p.get_full_name }}</a>
+                                                <a href="{% url 'users:contractor-profile' c.pk %}">{{ c.get_full_name }}</a>
                                             </p>
     
-                                            <p><span>{{ p.get_popular_specialization }}</span></p>
+                                            <p><span>{{ c.get_popular_specialization }}</span></p>
                                         </div>
                                     {% empty %}
                                         В группе пока нет участников
@@ -110,15 +110,15 @@
                         <div class="col-lg-9 divCol9">
                             <div class="col-lg-4">
                                 <p class="nameUser">{{ contractor.team.name }}</p>
-                                <p class="cityUser">Россия, Москва</p>
+                                <p class="cityUser">{{ contractor.get_location }}</p>
                                 <p class="navv">На сайте {{ contractor.team.created }}</p>
                                 
                                 <p class="navv">
-                                    Кол-во человек: <span>{{ participants_count }}</span>
+                                    Кол-во человек: <span>{{ team_member_count }}</span>
                                 </p>
                                 
                                 <p class="navv">
-                                    Выполненных проектов: <span>0</span>
+                                    Выполненных проектов: <span>{{ completed_project_count }}</span>
                                 </p>
                                 
                                 <div class="statusUser st-new">Свободен</div>

users/views.py

@@ -364,24 +364,42 @@ class ContractorOfficeView(DetailView):
     context_object_name = 'contractor'
     form_class = TeamForm
     
+    def dispatch(self, request, *args, **kwargs):
+        if request.user.is_authenticated() and request.user.is_contractor() and request.user.pk == int(kwargs.get('pk')):
+            return super().dispatch(request, *args, **kwargs)
+        else:
+            raise PermissionDenied
+    
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-        context['form_team'] = self.form_class
         
-        if self.object.is_owner_team():
+        contractor = self.object
-            participants = self.object.team.contractors.all()
+        
-            context['participants'] = participants
+        if util.get_related_or_none(contractor, 'team'):
-            context['participants_count'] = len(participants)
+            members = contractor.team.contractors.all()
+            context['team_members'] = members
+            context['team_member_count'] = len(members)
             
-            contractors = tuple(itertools.chain(participants, (self.object,)))
+            compl_proj = []
+            portfolios = []
+            work_sells = []
             
-            portfolios = Portfolio.objects.filter(user__in=contractors)
+            compl_proj.extend(tuple(o.project for o in contractor.orders.filter(status='completed')))
-            context['portfolios'] = portfolios
+            portfolios.extend(contractor.portfolios.all())
+            work_sells.extend(contractor.work_sell.all())
+            
+            for c in members:
+                compl_proj.extend(tuple(o.project for o in c.orders.filter(status='completed')))
+                portfolios.extend(c.portfolios.all())
+                work_sells.extend(c.work_sell.all())
             
-            work_sells = WorkSell.objects.filter(contractor__in=contractors)
+            context['completed_project_count'] = len(compl_proj)
+            context['portfolios'] = portfolios
             context['work_sells'] = work_sells
             
-            context['reviews'] = Review.objects.filter(target_contractor__in=contractors)
+            context['reviews'] = Review.objects.filter(target_contractor__in=itertools.chain((contractor,), members))
+        
+        context['form_team'] = self.form_class
         
         return context
 

work_sell/migrations/0006_remove_worksell_team.py

@@ -0,0 +1,19 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-26 17:25
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('work_sell', '0005_remove_worksell_img'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='worksell',
+            name='team',
+        ),
+    ]

work_sell/models.py

@@ -23,7 +23,6 @@ class WorkSell(models.Model):
     location = TreeForeignKey('common.Location', related_name='worksells', null=True, blank=True)
     name = models.CharField(max_length=255)
     specialization = TreeForeignKey(Specialization, related_name='worksells', null=True, blank=True)
-    team = models.ForeignKey(Team, related_name='work_sells', null=True, blank=True)
     term = models.IntegerField(default=0, null=True, blank=True)
     term_type = models.CharField(max_length=20, choices=TERMS, default='hour', null=True, blank=True)