From f43bb85af436888c90a8e8fa56c86c7c15f70ce3 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 2 Sep 2016 18:03:08 +0300 Subject: [PATCH 1/2] #ARC-55 --- .../commands/generate_work_sells.py | 8 +- users/models.py | 8 +- users/templates/contractor_office.html | 13 +- users/templates/contractor_profile.html | 6 +- users/templates/team_profile.html | 517 ++++++++++++++++++ users/urls.py | 7 +- users/views.py | 46 +- work_sell/filters.py | 1 + work_sell/migrations/0010_worksell_team.py | 22 + work_sell/models.py | 1 + work_sell/serializers.py | 4 +- 11 files changed, 600 insertions(+), 33 deletions(-) create mode 100644 users/templates/team_profile.html create mode 100644 work_sell/migrations/0010_worksell_team.py diff --git a/archilance/management/commands/generate_work_sells.py b/archilance/management/commands/generate_work_sells.py index 9992356..2b565b5 100644 --- a/archilance/management/commands/generate_work_sells.py +++ b/archilance/management/commands/generate_work_sells.py @@ -9,7 +9,7 @@ from archilance import util from common.models import Location from projects.models import TERM_TYPES, CURRENCIES, BuildingClassfication, ConstructionType from specializations.models import Specialization -from users.models import User +from users.models import User, Team from work_sell.models import WorkSell, WorkSellPhoto @@ -32,7 +32,11 @@ class Command(BaseCommand): ws.save() - ws.user = User.contractor_objects.order_by('?').first() + if _.sample((True, False)): + ws.contractor = User.contractor_objects.order_by('?').first() + else: + ws.team = Team.objects.order_by('?').first() + ws.building_classification = BuildingClassfication.objects.order_by('?').first() ws.construction_type = ConstructionType.objects.order_by('?').first() ws.location = Location.objects.root_nodes()[0].get_descendants().order_by('?').first() diff --git a/users/models.py b/users/models.py index ef4187d..4f7c5c2 100644 --- a/users/models.py +++ b/users/models.py @@ -220,12 +220,16 @@ class User(AbstractBaseUser, PermissionsMixin): def get_popular_specialization(self): from ratings.models import SpecializationRating - return SpecializationRating.objects.filter(user=self).order_by('position').first().specialization.name + + rating = SpecializationRating.objects.filter(user=self).order_by('position').first() + + if rating: + return rating.specialization.name class Team(models.Model): answers = GenericRelation('projects.Answer', related_query_name='teams') - avatar = models.ImageField(upload_to='teams/avatars/', blank=True) + avatar = models.ImageField(upload_to='teams/avatars/', blank=True) # TODO: Unused field? created = models.DateTimeField(default=timezone.now) name = models.CharField(max_length=255) owner = models.OneToOneField(User, related_name='team', blank=True, null=True) diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index 32e4f32..ade5edf 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -82,7 +82,7 @@

Состав группы

- {% for c in team_members %} + {% for c in contractor.team.contractors.all %}
{% if c.avatar %} @@ -114,7 +114,7 @@

На сайте {{ contractor.team.created }}

- Кол-во человек: {{ team_member_count }} + Кол-во человек: {{ contractor.team.contractors.count }}

@@ -261,17 +261,18 @@ var $moreWorkSellsfBtn = $('.-more-work-sells-btn').first() var workSellAbsUrl = '/work_sell/' + var contractorId = {{ contractor.pk }} var teamId = {{ contractor.team.pk }} - var contractorIds + var contractorIds = [contractorId] var portfUrl = new URI('/api/portfolios/') var workSellUrl = new URI('/api/work-sells/') var pageSize = 3 $.get('/api/teams/' + teamId + '/').then(function(res) { - contractorIds = _.map(function(contractor) { + Array.prototype.push.apply(contractorIds, _.map(function(contractor) { return contractor.id - }, res.contractors) + }, res.contractors)) }) .then(loadMorePortfolios) .then(loadMoreWorkSells) @@ -305,7 +306,7 @@ function loadMoreWorkSells() { var query = workSellUrl.query(true) - workSellUrl.setQuery('contractor__in', _.join(',', contractorIds)) + workSellUrl.setQuery('contractor', contractorId) workSellUrl.setQuery('page_size', pageSize) workSellUrl.setQuery('page', query.page ? Number(query.page) + 1 : 2) diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index ff9ae78..25b1d42 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -101,7 +101,7 @@

Контакты владельца

-
+
    {% if contractor.website %} @@ -113,6 +113,10 @@ {% if contractor.phone %}
  • {{ contractor.phone }}
    • {% endif %} + + {% if contractor.phone2 %} +
  • {{ contractor.phone2 }}
    • + {% endif %}
diff --git a/users/templates/team_profile.html b/users/templates/team_profile.html new file mode 100644 index 0000000..982ea5e --- /dev/null +++ b/users/templates/team_profile.html @@ -0,0 +1,517 @@ +{% extends 'partials/base.html' %} + +{% load specializtions_tags %} +{% load thumbnail %} + +{% block content %} + {% include 'partials/header.html' %} + +
+
+
+
+
+
+ {% if team.owner.avatar %} + {% thumbnail team.owner.avatar "265x264" crop="center" as im %} + profile-image + {% endthumbnail %} + {% else %} + profile-image + {% endif %} +
+
+ +
+ + добавить участника + + +
+

Состав группы

+ + {% for c in team.contractors.all %} +
+
+ {% if c.avatar %} + {% thumbnail c.avatar "60x60" crop="center" as im %} + mess-image + {% endthumbnail %} + {% else %} + mess-image + {% endif %} +
+ +

+ {{ c.get_full_name }} +

+ +

{{ c.get_popular_specialization }}

+
+ {% empty %} + В группе пока нет участников + {% endfor %} +
+
+
+ +
+
+

{{ team.name }}

+

{{ team.owner.get_location }}

+

На сайте {{ team.created }}

+ +

+ Кол-во человек: {{ team.contractors.count }} +

+ +

+ Выполненных проектов: {{ completed_project_count }} +

+ +
Свободен
+ написать сообщение +
+ +
+ {% specialization_team_widget team.pk %} +
+ +
+ {% ratings_team_widget team.pk %} + + {% if team.owner.cro %} +
+
+

Есть допуск СРО

+
+ {% endif %} +
+
+ +
+
+ +
+
+ +
+
+
+ +
+ +
+
+ показать еще +
+
+
+ +
+
+ +
+ +
+
+ показать еще +
+
+
+ +
+ {% for review in reviews %} +
+
+

+ {{ review.get_sender }} +

+ + {% if review.project.deal_type == 'secure_deal' %} + Безопасная сделка + {% endif %} + +
+ положительный отзыв +
+ +

+ {{ review.text|safe }} +

+
+
+ {% empty %} +
+

Отзывов пока нет

+
+ {% endfor %} +
+
+ + + +
+ {% include 'partials/footer.html' %} +
+
+
+
+{% endblock %} + + +{% block js_block %} + +{% endblock %} diff --git a/users/urls.py b/users/urls.py index 7868d83..879fb0f 100755 --- a/users/urls.py +++ b/users/urls.py @@ -7,13 +7,14 @@ from .views import ( ContractorFilterView, ContractorOfficeProjectsView, ContractorOfficeView, - ContractorProfileDetailView, + ContractorProfileView, ContractorResumeUpdateView, CustomerProfileCurrentProjectsView, CustomerProfileOpenProjectsView, CustomerProfileReviewsView, CustomerProfileTrashedProjectsView, TeamCreateView, + TeamProfileView, UserFinancialInfoEditView, UserProfileEditView, ) @@ -34,7 +35,9 @@ urlpatterns = [ urls.url(r'^contractors/resume/(?P\d+)/edit/$', ContractorResumeUpdateView.as_view(), name='contractor-resume-update'), urls.url(r'^contractors/team/create/$', TeamCreateView.as_view(), name='team-create'), urls.url(r'^contractorsresumefiles/create/$', contractor_resumefile_create, name='contractor-resume-file-create'), - urls.url(r'^contractors/(?P\d+)/$', ContractorProfileDetailView.as_view(), name='contractor-profile'), + urls.url(r'^contractors/(?P\d+)/$', ContractorProfileView.as_view(), name='contractor-profile'), urls.url(r'^contractor-office/(?P\d+)/$', ContractorOfficeView.as_view(), name='contractor-office'), urls.url(r'^contractor-office/(?P\d+)/open-projects/$', ContractorOfficeProjectsView.as_view(), name='contractor-office-open-projects'), + + urls.url(r'^teams/(?P\d+)/$', TeamProfileView.as_view(), name='team-profile'), ] diff --git a/users/views.py b/users/views.py index 103ccf4..6ae1c0a 100644 --- a/users/views.py +++ b/users/views.py @@ -325,7 +325,7 @@ class ContractorFilterView(BaseMixin, View): return render(request, self.template_name, context) -class ContractorProfileDetailView(DetailView): +class ContractorProfileView(DetailView): model = User worksell_form_class = WorkSellForm portfolio_form_class = PortfolioForm @@ -371,34 +371,42 @@ class ContractorOfficeView(DetailView): contractor = self.object if util.get_related_or_none(contractor, 'team'): - members = contractor.team.contractors.all() - context['team_members'] = members - context['team_member_count'] = len(members) + team = contractor.team - compl_proj = [] - # portfolios = [] # Fetched via DRF - # work_sells = [] # Fetched via DRF + # compl_proj = [] + # compl_proj.extend(tuple(o.project for o in contractor.orders.filter(status='completed'))) + # + # for c in members: + # compl_proj.extend(tuple(o.project for o in c.orders.filter(status='completed'))) - compl_proj.extend(tuple(o.project for o in contractor.orders.filter(status='completed'))) - # 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()) + compl_proj = tuple(o.project for o in team.orders.filter(status='completed')) context['completed_project_count'] = len(compl_proj) - # context['portfolios'] = portfolios - # context['work_sells'] = work_sells - - context['reviews'] = Review.objects.filter(target_contractor__in=itertools.chain((contractor,), members)) + context['reviews'] = Review.objects.filter(target_contractor=contractor) context['form_team'] = self.form_class return context +class TeamProfileView(DetailView): + model = Team + template_name = 'team_profile.html' + context_object_name = 'team' + + def get_context_data(self, **kwargs): + context = super().get_context_data(**kwargs) + + team = self.object + + compl_proj = tuple(o.project for o in team.orders.filter(status='completed')) + + context['completed_project_count'] = len(compl_proj) + context['reviews'] = Review.objects.filter(target_team=team) + + return context + + class ContractorOfficeProjectsView(BaseMixin, View): template_name = 'contractor_office_open_projects.html' diff --git a/work_sell/filters.py b/work_sell/filters.py index b37581f..50faa3c 100644 --- a/work_sell/filters.py +++ b/work_sell/filters.py @@ -38,6 +38,7 @@ class WorkSellFilterSet(FilterSet): location = RelatedFilter('common.filters.LocationFilterSet') photos = RelatedFilter('work_sell.filters.WorkSellPhotoFilterSet') specialization = RelatedFilter('specializations.filters.SpecializationFilterSet') + team = RelatedFilter('users.filters.TeamFilterSet') class Meta: model = WorkSell diff --git a/work_sell/migrations/0010_worksell_team.py b/work_sell/migrations/0010_worksell_team.py new file mode 100644 index 0000000..f8585ef --- /dev/null +++ b/work_sell/migrations/0010_worksell_team.py @@ -0,0 +1,22 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 14:19 +from __future__ import unicode_literals + +from django.db import migrations, models +import django.db.models.deletion + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0015_user_phone2'), + ('work_sell', '0009_auto_20160901_1548'), + ] + + operations = [ + migrations.AddField( + model_name='worksell', + name='team', + field=models.ForeignKey(blank=True, null=True, on_delete=django.db.models.deletion.CASCADE, related_name='work_sells', to='users.Team'), + ), + ] diff --git a/work_sell/models.py b/work_sell/models.py index 2d3b75f..b4c412b 100644 --- a/work_sell/models.py +++ b/work_sell/models.py @@ -21,6 +21,7 @@ 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=TERM_TYPES, default='hour', null=True, blank=True) diff --git a/work_sell/serializers.py b/work_sell/serializers.py index 35c4c2e..cde461a 100644 --- a/work_sell/serializers.py +++ b/work_sell/serializers.py @@ -5,7 +5,7 @@ from .models import WorkSell, WorkSellPhoto from common.serializers import LocationSerializer from projects.serializers import BuildingClassficationSerializer, ConstructionTypeSerializer from specializations.serializers import SpecializationSerializer -from users.serializers import UserSerializer +from users.serializers import UserSerializer, TeamSerializer class WorkSellPhotoSerializer(ModelSerializer): @@ -30,6 +30,7 @@ class WorkSellSerializer(ModelSerializer): location = LocationSerializer() photos = WorkSellPhotoSerializer(many=True) specialization = SpecializationSerializer() + team = TeamSerializer() class Meta: model = WorkSell @@ -47,6 +48,7 @@ class WorkSellSerializer(ModelSerializer): 'name', 'photos', 'specialization', + 'team', 'term', 'term_type', ) From 0e6f986c86e18e1d84782cb517c152280b7d380f Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 2 Sep 2016 18:09:34 +0300 Subject: [PATCH 2/2] Merge Django migrations --- projects/migrations/0025_merge.py | 16 ++++++++++++++++ wallets/migrations/0013_merge.py | 16 ++++++++++++++++ work_sell/migrations/0011_merge.py | 16 ++++++++++++++++ 3 files changed, 48 insertions(+) create mode 100644 projects/migrations/0025_merge.py create mode 100644 wallets/migrations/0013_merge.py create mode 100644 work_sell/migrations/0011_merge.py diff --git a/projects/migrations/0025_merge.py b/projects/migrations/0025_merge.py new file mode 100644 index 0000000..2de8cd4 --- /dev/null +++ b/projects/migrations/0025_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0024_auto_20160901_1548'), + ('projects', '0024_auto_20160901_1247'), + ] + + operations = [ + ] diff --git a/wallets/migrations/0013_merge.py b/wallets/migrations/0013_merge.py new file mode 100644 index 0000000..7b32b86 --- /dev/null +++ b/wallets/migrations/0013_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('wallets', '0012_auto_20160901_1548'), + ('wallets', '0012_auto_20160901_1247'), + ] + + operations = [ + ] diff --git a/work_sell/migrations/0011_merge.py b/work_sell/migrations/0011_merge.py new file mode 100644 index 0000000..c0f9c93 --- /dev/null +++ b/work_sell/migrations/0011_merge.py @@ -0,0 +1,16 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-02 15:04 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('work_sell', '0009_auto_20160901_1247'), + ('work_sell', '0010_worksell_team'), + ] + + operations = [ + ]