Merge branch 'setup' of https://bitbucket.org/PekopT/archilance into setup

archilance/management/commands/generate_teams.py

@@ -37,7 +37,7 @@ class Command(BaseCommand):
             team.save()
             
             team.owner = owner
-            team.users = _.sample(members, _.random(1, 5))
+            team.contractors = _.sample(members, _.random(1, 5))
             
             team.specializations = Specialization.objects.root_nodes()[0].get_descendants().order_by('?')[:_.random(1, 5)]
             team.portfolios = Portfolio.objects.order_by('?')[:_.random(1, 10)]

projects/migrations/0015_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-05 07:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('projects', '0013_auto_20160803_2003'),
+        ('projects', '0014_auto_20160804_1754'),
+    ]
+
+    operations = [
+    ]

projects/templates/project_detail.html

@@ -100,24 +100,23 @@
 			
 			<div class="infoProjectBlock info-new disTab">
 				<div class="triangle2"></div>
-				<div class="col-lg-10 col-lg-offset-1">
-					<ul class="listProjectIn">
-						<li>
-							<span>Местоположение:</span> {{ project.realty.country }}, {{ project.realty.city }}
-						</li>
-						<li>
-							<span>Классификация здания:</span> {{ project.realty.building_classification }}
-						</li>
-						<li>
-							<span>Вид строительства:</span> {{ project.realty.type_construction }}
-						</li>
-					</ul>
-				</div>
+				
+				{% if project.realty %}
+                    <div class="col-lg-10 col-lg-offset-1">
+                        <ul class="listProjectIn">
+                            <li><span>Местоположение:</span> {{ project.realty.location.name }}</li>
+                            <li><span>Классификация здания:</span> {{ project.realty.building_classification.name }}</li>
+                            <li><span>Вид строительства:</span> {{ project.realty.type_construction.name }}</li>
+                        </ul>
+                    </div>
+				{% endif %}
+				
 				<div class="col-lg-10 col-lg-offset-1">
 					<p class="textProIn">
                          {{ project.text }}
                     </p>
 				</div>
+				
 				<div class="col-lg-10 col-lg-offset-1">
 				    {% if request.user.is_contractor %}
                         <a href="#" class="new-answer">
@@ -171,7 +170,7 @@
                 
                 
                 {% with answer=request.user.contractor_answers.first %}
-                    <div class="b candidateBlock disTab">
+                    <div class="candidateBlock disTab">
                         <div class="candidate">
                             <div class="col-lg-4">
                                 <a href="#" class="aLinkExe">
@@ -186,8 +185,13 @@
                                 <p class="nameExecutor">
                                     <a href="#">{{ answer.author.get_full_name }} [{{ answer.author.username }}]</a>
                                 </p>
-                                <p class="navv2">На сайте {{ answer.contractor.created }}</p>
-                                <div class="statusUser">Свободен</div>
+                                <p class="navv2">На сайте {{ answer.author.created }}</p>
+                                
+                                {% if answer.author|class_name == 'User' %}
+                                    {% if answer.author.contractor_status == 'free' %}
+                                        <div class="statusUser">Свободен</div><!-- ............. -->
+                                    {% endif %}
+                                {% endif %}
                             </div>
                             <div class="col-lg-3 retts">
                                 <ul class="rettList restList2">
@@ -201,6 +205,7 @@
                                         </a>
                                     </li>
                                 </ul>
+                                
                                 <div class="sroUser sroExecutor">
                                     <div class="iconSRO"></div>
                                     <p>Есть допуск СРО</p>

users/migrations/0005_merge.py

@@ -0,0 +1,16 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-05 07:09
+from __future__ import unicode_literals
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0004_user_contractor_rating'),
+        ('users', '0004_team_avatar'),
+    ]
+
+    operations = [
+    ]

users/migrations/0006_auto_20160805_1442.py

@@ -0,0 +1,25 @@
+# -*- coding: utf-8 -*-
+# Generated by Django 1.9.7 on 2016-08-05 11:42
+from __future__ import unicode_literals
+
+from django.conf import settings
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('users', '0005_merge'),
+    ]
+
+    operations = [
+        migrations.RemoveField(
+            model_name='team',
+            name='users',
+        ),
+        migrations.AddField(
+            model_name='team',
+            name='contractors',
+            field=models.ManyToManyField(blank=True, related_name='teams', to=settings.AUTH_USER_MODEL),
+        ),
+    ]

users/models.py

@@ -146,10 +146,6 @@ class User(AbstractBaseUser, PermissionsMixin):
     def is_staff(self):
         return self.is_superuser
 
-    @property
-    def is_free(self):
-        return self.contractor_status == 'free'
-
     def __str__(self):
         return self.email
     
@@ -192,7 +188,7 @@ class Team(models.Model):
     name = models.CharField(max_length=255)
     owner = models.OneToOneField(User, related_name='team', blank=True, null=True)
     specializations = TreeManyToManyField(Specialization, related_name='teams', blank=True)
-    users = models.ManyToManyField(User, related_name ='teams', blank=True)
+    contractors = models.ManyToManyField(User, limit_choices_to={'groups__name': 'Исполнители'}, related_name ='teams', blank=True)
     
     def __str__(self):
         return self.name

users/templates/contractor_profile.html

@@ -63,9 +63,11 @@
                         </p>
                         <p class="cityUser">Россия, Москва</p>
                         <p class="navv">На сайте 8 лет и 3 месяца</p>
-                        {% if contractor.is_free %}
+                        
+                        {% if contractor.contractor_status == 'free' %}
                             <div class="statusUser">Свободен</div>
                         {% endif %}
+                        
                         <a href="javascript:void(0)" class="showCon">показать контакты</a>
                     </div>
                     <div class="col-lg-4">

users/views.py

@@ -339,7 +339,8 @@ class ContractorProfileDetailView(DetailView):
     portfolio_form_class = PortfolioForm
     template_name = 'contractor_profile.html'
     context_object_name = 'contractor'
-
+    queryset = User.contractor_objects
+    
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)