mitri4
/
proekton.com
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

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

Browse Source
remotes/origin/PR-39
Mukhtar 10 years ago
parent db9d524bf9 ff72424526
commit 7fe3406f1d
9 changed files with 94 additions and 63 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 6
      README.md
  2. 9
      assets/js/main.js
  3. 19
      projects/migrations/0013_auto_20160819_1735.py
  4. 4
      projects/views.py
  5. 1
      ratings/management/commands/recalculation_spec.py
  6. 35
      ratings/templates/templatetags/specializations_widget.html
  7. 21
      users/migrations/0011_auto_20160819_1735.py
  8. 6
      users/models.py
  9. 56
      users/templates/contractor_filter.html

6
README.md
Unescape View File

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

9
assets/js/main.js
Unescape View File

@ -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')
}
});

19
projects/migrations/0013_auto_20160819_1735.py
Unescape View File

@ -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': 'Отклики на проекты -- переписки'},
),
]

4
projects/views.py
Unescape View File

@ -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')

1
ratings/management/commands/recalculation_spec.py
Unescape View File

@ -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')

35
ratings/templates/templatetags/specializations_widget.html
Unescape View File

@ -1,3 +1,38 @@
{#<!-- Новая вёрстка ---------------------------------------------------->#}
{##}
{# <div class="dashedCol4 dashedCol44">#}
{# <p class="specUser">#}
{# Специализации:#}
{# </p>#}
{# <div class="insetSpec">#}
{# <span>Интерьеры</span>#}
{# <span>2-й</span>#}
{# </div>#}
{# <div class="insetSpec">#}
{# <span>Визуализация/3D</span>#}
{# <span>45-й</span>#}
{# </div>#}
{# <div class="insetSpec">#}
{# <span>Экстерьеры</span>#}
{# <span>10-й</span>#}
{# </div>#}
{# <div class="showSpec">#}
{# <div class="insetSpec">#}
{# <span>Архитектура</span>#}
{# <span>3-й</span>#}
{# </div>#}
{# <div class="insetSpec">#}
{# <span>3D Моделирование</span>#}
{# <span>100-й</span>#}
{# </div>#}
{# </div>#}
{# <button class="showPress">#}
{# #}
{# </button>#}
{# </div>#}
<div class="dashedCol4">
<p class="specUser">Специализации:</p>
{% for spec in specializations %}

21
users/migrations/0011_auto_20160819_1735.py
Unescape View File

@ -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,
),
]

6
users/models.py
Unescape View File

@ -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 = 'Резюме'
@ -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)

56
users/templates/contractor_filter.html
Unescape View File

@ -207,33 +207,11 @@
<div class="col-lg-3">
<div class="dashedCol4 dashedCol44">
<p class="specUser">
Специализации:
</p>
<div class="insetSpec">
<span>Интерьеры</span>
<span>2-й</span>
</div>
<div class="showSpec">
<div class="insetSpec">
<span>Архитектура</span>
<span>3-й</span>
</div>
<div class="insetSpec">
<span>3D Моделирование</span>
<span>100-й</span>
</div>
</div>
<button class="showPress">
</button>
</div>
{% specialization_team_widget team_id=team.pk %}
</div>
<div class="col-lg-3 retts">
<ul class="rettList restList2">
<li>Рейтинг: <span> 1245</span></li>
<li>Безопасные сделки: <span> 5</span></li>
@ -315,7 +293,6 @@
{% thumbnail contractor.avatar "126x125" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="profile-image">
{% endif %}
@ -354,36 +331,7 @@
<div class="col-lg-3">
<div class="dashedCol4 dashedCol44">
<p class="specUser">
Специализации:
</p>
<div class="insetSpec">
<span>Интерьеры</span>
<span>2-й</span>
</div>
<div class="insetSpec">
<span>Визуализация/3D</span>
<span>45-й</span>
</div>
<div class="insetSpec">
<span>Экстерьеры</span>
<span>10-й</span>
</div>
<div class="showSpec">
<div class="insetSpec">
<span>Архитектура</span>
<span>3-й</span>
</div>
<div class="insetSpec">
<span>3D Моделирование</span>
<span>100-й</span>
</div>
</div>
<button class="showPress">
</button>
</div>
{% specialization_widget user_id=contractor.pk %}
</div>

Write Preview
Loading…
Cancel
Save