From ff80f2d4ea0c3259a25701c1cd6ceb2b7e9d05e2 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 19 Aug 2016 17:09:20 +0300 Subject: [PATCH 1/2] Fixes --- README.md | 6 ++ assets/js/main.js | 9 ++- projects/views.py | 4 -- .../management/commands/recalculation_spec.py | 1 - .../templatetags/specializations_widget.html | 35 ++++++++++++ users/models.py | 2 +- users/templates/contractor_filter.html | 56 +------------------ 7 files changed, 52 insertions(+), 61 deletions(-) diff --git a/README.md b/README.md index cb0f10f..e0b6879 100644 --- a/README.md +++ b/README.md @@ -21,6 +21,12 @@ python manage.py makemigrations thumbnail python manage.py migrate ``` +Run the command at leat once to see specialization ratings: + +``` +python manage.py recalculation_spec +``` + ``` python manage.py runserver ``` diff --git a/assets/js/main.js b/assets/js/main.js index 8a84a48..dfc540c 100644 --- a/assets/js/main.js +++ b/assets/js/main.js @@ -2,16 +2,23 @@ $(document).ready(function(){ $('.messd:first').addClass('mesAct'); $('.orderBlock:first').addClass('orAct'); - + + if(!$.cookie('slideResVisible')) { + $('.slideRes').slideUp(300); + $('.resButtonF1').css('transform','rotate(180deg)'); + } + $('.resButtonF1').click(function(e){ e.preventDefault(); $('.slideRes').toggleClass('activeSlide'); if($('.slideRes').hasClass('activeSlide')) { $('.slideRes').slideUp(300); $(this).css('transform','rotate(180deg)'); + $.cookie('slideResVisible', '') } else { $('.slideRes').slideDown(300); $(this).css('transform','rotate(0deg)'); + $.cookie('slideResVisible', 'on') } }); diff --git a/projects/views.py b/projects/views.py index ca8d423..20b0919 100644 --- a/projects/views.py +++ b/projects/views.py @@ -181,13 +181,9 @@ class ContractorRejectProjectAnswerView(BaseMixin, View): def post(self, request, *args, **kwargs): answer = get_object_or_404(request.user.contractor_answers, pk=kwargs.get('pk')) - project = answer.project answer.delete() - project.rejected_answers_count = F('rejected_answers_count') + 1 - project.save() - messages.info(request, 'Вы успешно отказались от проекта') redirect_to = request.POST.get('next') diff --git a/ratings/management/commands/recalculation_spec.py b/ratings/management/commands/recalculation_spec.py index acfb5d5..9232651 100644 --- a/ratings/management/commands/recalculation_spec.py +++ b/ratings/management/commands/recalculation_spec.py @@ -5,7 +5,6 @@ from users.models import User, Team class Command(BaseCommand): - def handle(self, *args, **options): users = User.objects.values('pk', 'rating').filter(is_superuser=False).order_by('-rating') teams = Team.objects.values('pk', 'rating').order_by('-rating') diff --git a/ratings/templates/templatetags/specializations_widget.html b/ratings/templates/templatetags/specializations_widget.html index c8a1175..65d20f0 100644 --- a/ratings/templates/templatetags/specializations_widget.html +++ b/ratings/templates/templatetags/specializations_widget.html @@ -1,3 +1,38 @@ +{##} +{##} +{#
#} +{#

#} +{# Специализации:#} +{#

#} +{#
#} +{# Интерьеры#} +{# 2-й#} +{#
#} +{#
#} +{# Визуализация/3D#} +{# 45-й#} +{#
#} +{#
#} +{# Экстерьеры#} +{# 10-й#} +{#
#} +{#
#} +{#
#} +{# Архитектура#} +{# 3-й#} +{#
#} +{#
#} +{# 3D Моделирование#} +{# 100-й#} +{#
#} +{#
#} +{# #} +{#
#} + + +

Специализации:

{% for spec in specializations %} diff --git a/users/models.py b/users/models.py index 2b3a9a2..b08ee3b 100644 --- a/users/models.py +++ b/users/models.py @@ -120,7 +120,6 @@ class User(AbstractBaseUser, PermissionsMixin): avatar = models.ImageField(upload_to='users/avatars/', blank=True) contractor_answers = GenericRelation('projects.Answer') - rating = models.FloatField(default=0.0) contractor_resume = models.OneToOneField(ContractorResume, related_name='contractor', blank=True, null=True) contractor_specializations = TreeManyToManyField(Specialization, related_name='contractors', blank=True) contractor_status = models.CharField(default='free', max_length=20, choices=STATUSES) @@ -138,6 +137,7 @@ class User(AbstractBaseUser, PermissionsMixin): location = TreeForeignKey('common.Location', related_name='users', null=True, blank=True) patronym = models.CharField(max_length=255, blank=True) phone = models.CharField(max_length=30, blank=True, null=True) + rating = models.FloatField(default=0.0) skype = models.CharField(max_length=100, blank=True) username = models.CharField(max_length=50, unique=True) website = models.CharField(max_length=255, blank=True) diff --git a/users/templates/contractor_filter.html b/users/templates/contractor_filter.html index be86d88..3037eab 100644 --- a/users/templates/contractor_filter.html +++ b/users/templates/contractor_filter.html @@ -207,33 +207,11 @@
-
-

- Специализации: -

-
- Интерьеры - 2-й -
-
-
- Архитектура - 3-й -
-
- 3D Моделирование - 100-й -
-
- -
+ {% specialization_team_widget team_id=team.pk %}
-
  • Рейтинг: 1245
  • Безопасные сделки: 5
    • @@ -315,7 +293,6 @@ {% thumbnail contractor.avatar "126x125" crop="center" as im %} profile-image {% endthumbnail %} - {% else %} profile-image {% endif %} @@ -354,36 +331,7 @@
    -
    -

    - Специализации: -

    -
    - Интерьеры - 2-й -
    -
    - Визуализация/3D - 45-й -
    -
    - Экстерьеры - 10-й -
    -
    -
    - Архитектура - 3-й -
    -
    - 3D Моделирование - 100-й -
    -
    - -
    + {% specialization_widget user_id=contractor.pk %}
    From ff724245269d06d6115977a0fbd871a44cc3c440 Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 19 Aug 2016 17:36:42 +0300 Subject: [PATCH 2/2] Admin bug fix --- .../migrations/0013_auto_20160819_1735.py | 19 +++++++++++++++++ users/migrations/0011_auto_20160819_1735.py | 21 +++++++++++++++++++ users/models.py | 4 ++-- 3 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 projects/migrations/0013_auto_20160819_1735.py create mode 100644 users/migrations/0011_auto_20160819_1735.py diff --git a/projects/migrations/0013_auto_20160819_1735.py b/projects/migrations/0013_auto_20160819_1735.py new file mode 100644 index 0000000..32cb31d --- /dev/null +++ b/projects/migrations/0013_auto_20160819_1735.py @@ -0,0 +1,19 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-19 14:35 +from __future__ import unicode_literals + +from django.db import migrations + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0012_project_rejected_answers_count'), + ] + + operations = [ + migrations.AlterModelOptions( + name='answermessage', + options={'ordering': ['created'], 'verbose_name': 'Отклики на проекты -- переписка', 'verbose_name_plural': 'Отклики на проекты -- переписки'}, + ), + ] diff --git a/users/migrations/0011_auto_20160819_1735.py b/users/migrations/0011_auto_20160819_1735.py new file mode 100644 index 0000000..57aa6c0 --- /dev/null +++ b/users/migrations/0011_auto_20160819_1735.py @@ -0,0 +1,21 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-08-19 14:35 +from __future__ import unicode_literals + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('users', '0010_auto_20160818_2131'), + ] + + operations = [ + migrations.AlterField( + model_name='contractorresume', + name='text', + field=models.TextField(blank=True, default=''), + preserve_default=False, + ), + ] diff --git a/users/models.py b/users/models.py index c2293cf..d186d23 100644 --- a/users/models.py +++ b/users/models.py @@ -81,10 +81,10 @@ class UserFinancialInfo(models.Model): class ContractorResume(models.Model): resume_file = models.FileField(upload_to='users/resume/files/', null=True, blank=True) - text = models.TextField(null=True, blank=True) + text = models.TextField(blank=True) def __str__(self): - return self.text + return str(self.pk) class Meta: verbose_name = 'Резюме'