From a5aa2e3b7e98fec98a8f5634953298dedea07dea Mon Sep 17 00:00:00 2001 From: ArturBaybulatov Date: Fri, 16 Sep 2016 20:02:13 +0300 Subject: [PATCH] Fixes --- .../migrations/0034_auto_20160916_1933.py | 46 ++++++++++ projects/models.py | 10 +- .../templates/customer_project_create.html | 11 +-- users/templates/contractor_profile.html | 91 ++++++++++++------- users/views.py | 1 + wallets/forms.py | 4 +- wallets/migrations/0016_auto_20160916_1933.py | 27 ++++++ wallets/models.py | 10 +- wallets/templates/score-detail.html | 11 +++ 9 files changed, 160 insertions(+), 51 deletions(-) create mode 100644 projects/migrations/0034_auto_20160916_1933.py create mode 100644 wallets/migrations/0016_auto_20160916_1933.py diff --git a/projects/migrations/0034_auto_20160916_1933.py b/projects/migrations/0034_auto_20160916_1933.py new file mode 100644 index 0000000..a731d00 --- /dev/null +++ b/projects/migrations/0034_auto_20160916_1933.py @@ -0,0 +1,46 @@ +# -*- coding: utf-8 -*- +# Generated by Django 1.9.7 on 2016-09-16 16:33 +from __future__ import unicode_literals + +from django.db import migrations, models +import projects.validators + + +class Migration(migrations.Migration): + + dependencies = [ + ('projects', '0033_auto_20160916_1534'), + ] + + operations = [ + migrations.AlterField( + model_name='projectworktypesuggestion', + name='commentary', + field=models.TextField(blank=True, verbose_name='Комментарий'), + ), + migrations.AlterField( + model_name='projectworktypesuggestion', + name='email', + field=models.EmailField(max_length=254, verbose_name='Email'), + ), + migrations.AlterField( + model_name='projectworktypesuggestion', + name='name', + field=models.CharField(max_length=255, verbose_name='Название'), + ), + migrations.AlterField( + model_name='projectworktypesuggestion', + name='processed', + field=models.BooleanField(default=False, verbose_name='Рассмотрено?'), + ), + migrations.AlterField( + model_name='projectworktypesuggestion', + name='username', + field=models.CharField(blank=True, max_length=255, verbose_name='Имя пользователя'), + ), + migrations.AlterField( + model_name='stage', + name='term', + field=models.DateField(validators=[projects.validators.validate_term]), + ), + ] diff --git a/projects/models.py b/projects/models.py index ceb959f..5b1ae47 100644 --- a/projects/models.py +++ b/projects/models.py @@ -356,11 +356,11 @@ class PortfolioPhoto(models.Model): class ProjectWorkTypeSuggestion(models.Model): - name = models.CharField(max_length=255) - commentary = models.TextField(blank=True) - processed = models.BooleanField(default=False) - username = models.CharField(max_length=255) - email = models.EmailField() + name = models.CharField(max_length=255, verbose_name='Название') + commentary = models.TextField(blank=True, verbose_name='Комментарий') + processed = models.BooleanField(default=False, verbose_name='Рассмотрено?') + username = models.CharField(max_length=255, blank=True, verbose_name='Имя пользователя') + email = models.EmailField(verbose_name='Email') class Meta: verbose_name = 'Предложение типов работ (проектов)' diff --git a/projects/templates/customer_project_create.html b/projects/templates/customer_project_create.html index 508d25f..d79fd31 100644 --- a/projects/templates/customer_project_create.html +++ b/projects/templates/customer_project_create.html @@ -304,22 +304,19 @@ ;(function() { - var $workTypeSuggestionModal = $('#projectWorkTypeSuggestionModal') - var $form = $workTypeSuggestionModal.find('.-project-work-type-suggestion-form').first() + var $modal = $('#projectWorkTypeSuggestionModal') + var $form = $modal.find('.-project-work-type-suggestion-form').first() var workTypeSuggestionUrl = '/projects/suggest-work-type/' - $workTypeSuggestionModal.find('.-action-button').first().on('click', function($evt) { + $modal.find('.-action-button').first().on('click', function($evt) { $.post(workTypeSuggestionUrl, $form.serialize()) .then(function(res) { if (res.status === 'success') { - console.log('Success') $form.trigger('reset') $('.-error').text('') - $workTypeSuggestionModal.modal('hide') + $modal.modal('hide') $.jGrowl('Предложение успешно отправлено') } else if (res.status === 'error') { - console.log('Error') - _.flow( _.toPairs, diff --git a/users/templates/contractor_profile.html b/users/templates/contractor_profile.html index a9a9aba..b9564a6 100644 --- a/users/templates/contractor_profile.html +++ b/users/templates/contractor_profile.html @@ -117,7 +117,7 @@

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

-
+
    {% if contractor.website %} @@ -126,6 +126,10 @@
  • {{ contractor.email }}
    • + {% if contractor.skype %} +
  • {{ contractor.skype }}
    • + {% endif %} + {% if contractor.phone %}
  • {{ contractor.phone }}
    • {% endif %} @@ -346,20 +350,22 @@
    -
    -
    - - -
    - -

    Загрузить резюме

    -
    - -
    -

    Удалить резюме

    -
    -
    -
    + {% if contractor == request.user %} +
    +
    + + +
    + +

    Загрузить резюме

    +
    + +
    +

    Удалить резюме

    +
    +
    +
    + {% endif %}
    @@ -412,9 +418,12 @@
    - - - + {% if contractor.pk == request.user.pk %} + + + + {% endif %} +
    {{ contractor.contractor_resume.text|safe }}
    @@ -450,10 +459,14 @@