diff --git a/common/templatetags/common_tags.py b/common/templatetags/common_tags.py index 2f8490b..37b43ae 100644 --- a/common/templatetags/common_tags.py +++ b/common/templatetags/common_tags.py @@ -31,4 +31,8 @@ def to_str(val): return str(val) +@register.filter +def multiply(string, times): + return string * times + # import code; code.interact(local=dict(globals(), **locals())) diff --git a/projects/templates/comparison.html b/projects/templates/comparison.html index e960665..8d4cf33 100644 --- a/projects/templates/comparison.html +++ b/projects/templates/comparison.html @@ -25,21 +25,17 @@ Безопасные сделки Решение - - {% for cand in object.candidates.all %} - 1 - + {{ forloop.counter }} - - {{ cand.answer.user.get_full_name }} + {{ cand.answer.contractor.get_full_name }} - {{ cand.answer.cost }} + {{ cand.answer.budget }} - {{ cand.answer.term }}
недели + {{ cand.answer.term }}
{{ cand.answer.term_type }} @@ -48,20 +44,22 @@ - 5
+ 0
Готов работать по безопасной сделке diff --git a/projects/templates/customer_project_detail.html b/projects/templates/customer_project_detail.html index 8c25c11..6ecc8ad 100644 --- a/projects/templates/customer_project_detail.html +++ b/projects/templates/customer_project_detail.html @@ -16,9 +16,9 @@ execitor-image

- {{ project.user.get_full_name }} [ivanov_petr] + {{ project.contractor.get_full_name }} [ivanov_petr]

-

На сайте {{ object.created | naturaltime }}

+

На сайте {{ project.contractor.created | naturaltime }}

+{##} diff --git a/projects/templatetags/projects_tags.py b/projects/templatetags/projects_tags.py index 59062b0..b82c290 100644 --- a/projects/templatetags/projects_tags.py +++ b/projects/templatetags/projects_tags.py @@ -3,7 +3,7 @@ from django import template register = template.Library() @register.inclusion_tag("templatetags/ratings_widget.html", takes_context=True) -def ratings_widget(context, user_id): +def ratings_widget(context, user_id, class_name=None): ratings = user_id return { 'ratings': ratings, diff --git a/projects/urls.py b/projects/urls.py index d9dec07..4f9ccd4 100644 --- a/projects/urls.py +++ b/projects/urls.py @@ -3,7 +3,6 @@ from django.views.generic import TemplateView from .views import ( add_candidate, - ChatView, ContractorProjectAnswerView, CustomerProjectCreateView, CustomerProjectDeleteView, @@ -32,6 +31,5 @@ urlpatterns = [ urls.url(r'^candidate/add/(?P(\d+))/(?P(\d+))/$', add_candidate, name='add-candidate'), urls.url(r'^candidate/comparison/(?P\d+)$', ProjectComparisonView.as_view(), name='comparison'), # urls.url(r'^portfolio/create/$', PortfolioCreateView.as_view(), name='portfolio-create'), - urls.url(r'chat/$', ChatView.as_view(), name='chat'), urls.url(r'offerorder/(?P(\d+))/(?P(\d+))/$', OfferOrderView.as_view(), name='offer-order'), ] diff --git a/projects/views.py b/projects/views.py index 5b7221f..a06ea42 100644 --- a/projects/views.py +++ b/projects/views.py @@ -99,6 +99,7 @@ class ProjectsView(ListView): class ProjectView(BaseMixin, View): template_name = 'project_detail.html' customer_template_name = 'customer_project_detail.html' + form_class = ContractorProjectAnswerForm def get(self, request, *args, **kwargs): project = get_object_or_404(Project, pk=kwargs.get('pk')) @@ -109,6 +110,8 @@ class ProjectView(BaseMixin, View): if request.user.is_authenticated() and request.user.is_customer(): return render(request, self.customer_template_name, context) else: + form = self.form_class() + context.update({'form': form}) return render(request, self.template_name, context) @@ -166,7 +169,6 @@ class ContractorProjectAnswerView(BaseMixin, View): answer.contractor = request.user answer.project = project answer.save() - order = Order.objects.create(project=project) return HttpResponseRedirect(reverse('projects:detail', kwargs={'pk': project.pk})) @@ -251,13 +253,6 @@ def add_candidate(request, answer_id, project_id): return HttpResponseRedirect(reverse('projects:detail',args=[project_id])) -class ChatView(View): - template_name = 'chat.html' - - def get(self, request, *args, **kwargs): - return render(request, self.template_name) - - class OfferOrderView(View): template_name = 'chattest.html' diff --git a/specializations/templates/templatetags/specializations_widget.html b/specializations/templates/templatetags/specializations_widget.html index 89f66f0..97aa3e2 100644 --- a/specializations/templates/templatetags/specializations_widget.html +++ b/specializations/templates/templatetags/specializations_widget.html @@ -7,3 +7,15 @@ {% endfor %} +{#
#} +{#

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

#} +{#
#} +{# Интерьеры#} +{#
#} +{# #} +{#
#} +{# Визуализация/3D#} +{#
#} +{#
#} diff --git a/users/mixins.py b/users/mixins.py index dff6368..d31cc8f 100644 --- a/users/mixins.py +++ b/users/mixins.py @@ -5,7 +5,6 @@ from django.contrib import messages class CheckForUserMixin(object): def dispatch(self, request, *args, **kwargs): - messages.info(request,str(request.user)) if request.user.is_authenticated(): pk = kwargs.get('pk') if pk: diff --git a/users/models.py b/users/models.py index 8439982..778f61f 100644 --- a/users/models.py +++ b/users/models.py @@ -117,7 +117,10 @@ class User(AbstractBaseUser, PermissionsMixin): def get_full_name(self): return self.first_name + ' ' + self.last_name - + + def get_profile_image(self): + return self.avatar + USERNAME_FIELD = 'email' REQUIRED_FIELDS = [] objects = UserManager() diff --git a/projects/templates/chat.html b/users/templates/contractor_chat.html similarity index 99% rename from projects/templates/chat.html rename to users/templates/contractor_chat.html index b3e5496..fc30eb2 100644 --- a/projects/templates/chat.html +++ b/users/templates/contractor_chat.html @@ -1,10 +1,9 @@ {% extends 'partials/base.html' %} - +{% load staticfiles %} +{% load common_tags %} {% block content %} - {% include 'partials/header.html' %} - {% load staticfiles %} - {% load humanize %} -
+{% include 'partials/header.html' %} +

Чат

@@ -577,8 +576,7 @@
- - {% include 'partials/footer.html' %} + {% include 'partials/footer.html' %}
{% endblock %} diff --git a/users/templates/contractor_profile_edit.html b/users/templates/contractor_profile_edit.html index 1e06465..d2841fc 100644 --- a/users/templates/contractor_profile_edit.html +++ b/users/templates/contractor_profile_edit.html @@ -1,23 +1,14 @@ {% extends 'partials/base.html' %} {% load staticfiles %} +{% load common_tags %} {% block content %} -{% include 'partials/header.html' %} +{% include 'partials/header2.html' %}
{% csrf_token %}
-{% load mptt_tags %} - {% recursetree nodes %} -
  • - {{ node.name }} - {% if not node.is_leaf_node %} - --- - {{ children }} - - {% endif %} -
    • - {% endrecursetree %} + {% load mptt_tags %} {{ form.errors }}
    @@ -40,25 +31,16 @@
    -{#

    Специализация: {{ form.location}}

    #} -{#

    {{ form.contractor_specializations }}

    #} - +

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

    +
    {% for spec in form.instance.contractor_specializations.all %} -

    {{ spec }}

    - {% endfor %} -
    - + {% for sp in nodes %} + + {% endfor %} } - - + {% endfor %} Добавить еще @@ -67,15 +49,16 @@
    -

    Местоположение: {{ form.location.value }}

    +

    Местоположение:

    + -
    @@ -147,6 +130,8 @@