diff --git a/archilance/settings/base.py b/archilance/settings/base.py index c5472f9..13c9b8e 100644 --- a/archilance/settings/base.py +++ b/archilance/settings/base.py @@ -12,7 +12,7 @@ SECRET_KEY = 'vb6@b9zj7^f!^+x*e8=e!oundyu1!e*&0i(3gu2xwo4%fx4h&n' # SECURITY WARNING: don't run with debug turned on in production! DEBUG = True -TEMPLATE_DEBUG = False # Show debug info in templates. See `projects/templates/project_filter.html` +TEMPLATE_DEBUG = True # Show debug info in templates. See `projects/templates/project_filter.html` ALLOWED_HOSTS = [] diff --git a/projects/models.py b/projects/models.py index 4be06fd..f7273d1 100644 --- a/projects/models.py +++ b/projects/models.py @@ -84,7 +84,7 @@ class Project(models.Model, HitCountMixin): created = models.DateTimeField(default=timezone.now) cro = models.BooleanField(default=False) currency = models.CharField(max_length=20, default='rur', choices=CURRENCIES) - customer = models.ForeignKey(User, related_name='projects') + customer = models.ForeignKey(User, related_name='projects') # Related name should've been "customer_projects" deal_type = models.CharField(max_length=20, default='secure_deal', choices=DEAL_TYPES) name = models.CharField(max_length=255) price_and_term_required = models.BooleanField(default=False) diff --git a/projects/views.py b/projects/views.py index 4590e0d..b2ef7a1 100644 --- a/projects/views.py +++ b/projects/views.py @@ -1,5 +1,4 @@ from django.conf import settings -from django.core.exceptions import PermissionDenied from django.contrib import messages from django.contrib.auth.mixins import PermissionRequiredMixin, LoginRequiredMixin from django.core.exceptions import PermissionDenied @@ -10,7 +9,6 @@ from django.db.models import Q, F from django.http import HttpResponseForbidden, HttpResponseRedirect, HttpResponse, Http404 from django.shortcuts import render, get_object_or_404, redirect from django.views.generic import ListView, DetailView, CreateView, DeleteView, View, UpdateView, TemplateView, FormView - from hitcount.models import HitCount from hitcount.views import HitCountMixin from pprint import pprint, pformat @@ -128,7 +126,7 @@ class ProjectDetailWithAnswerView(BaseMixin, View): context.update({'form': form}) return render(request, self.template_name, context) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied class ProjectAnswerCreateMessageView(BaseMixin, View): @@ -138,7 +136,7 @@ class ProjectAnswerCreateMessageView(BaseMixin, View): if request.user.is_authenticated(): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def post(self, request, *args, **kwargs): form = self.form_class(request.POST, request=request) @@ -515,7 +513,7 @@ class CustomerProjectTrashView(View): if request.user.is_authenticated() and request.user.is_customer(): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def post(self, req, *args, **kwargs): form = self.form_class(_.merge({}, req.POST, kwargs), req=req) @@ -540,7 +538,7 @@ class CustomerProjectRestoreView(View): if request.user.is_authenticated() and request.user.is_customer(): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def post(self, req, *args, **kwargs): form = self.form_class(_.merge({}, req.POST, kwargs), req=req) @@ -565,7 +563,7 @@ class CustomerProjectDeleteView(View): if request.user.is_authenticated() and request.user.is_customer(): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def post(self, req, *args, **kwargs): form = self.form_class(_.merge({}, req.POST, kwargs), req=req) @@ -717,5 +715,4 @@ class PortfolioDetail(DetailView): template_name = 'portfolio_detail.html' - # import code; code.interact(local=dict(globals(), **locals())) diff --git a/templates/message.html b/templates/message.html index 0346ef0..d94db73 100644 --- a/templates/message.html +++ b/templates/message.html @@ -1,11 +1,37 @@ {% extends 'partials/base.html' %} +{% block head %} + +{% endblock %} + {% block content %} -
-
-
-

{{ message }}

+ {% include 'partials/header.html' %} + +
+
+
+

{{ message }}

+ + {% if request.user.is_authenticated %} +
+ + Вернуться на страницу личного счёта + + + (автоматически через 15 секунд) +
+ {% endif %}
+ + {% include 'partials/footer.html' %}
{% endblock %} + +{% block js_block %} + +{% endblock %} diff --git a/templates/partials/base.html b/templates/partials/base.html index 3d09907..f73f213 100644 --- a/templates/partials/base.html +++ b/templates/partials/base.html @@ -1,4 +1,6 @@ {% load staticfiles %} +{% load compress %} + @@ -7,9 +9,10 @@ + + {% block head %}{% endblock %} Archilance - {% load compress %} {% compress css %} diff --git a/templates/partials/pagination.html b/templates/partials/pagination.html index c6cf37b..f7376f0 100644 --- a/templates/partials/pagination.html +++ b/templates/partials/pagination.html @@ -53,9 +53,9 @@ {% endif %} diff --git a/users/forms.py b/users/forms.py index 887f6d9..7ab32ac 100644 --- a/users/forms.py +++ b/users/forms.py @@ -9,9 +9,9 @@ from specializations.models import Specialization class TeamForm(forms.ModelForm): - class Meta: model = Team + fields = ( 'name', 'owner', @@ -19,15 +19,14 @@ class TeamForm(forms.ModelForm): class ContractorResumeForm(forms.ModelForm): - class Meta: model = ContractorResume + fields = ( 'text', ) class ContractorResumeFilesForm(forms.ModelForm): - class Meta: model = ContractorResumeFiles diff --git a/users/templates/contractor_office.html b/users/templates/contractor_office.html index a7e23a1..4327f5a 100644 --- a/users/templates/contractor_office.html +++ b/users/templates/contractor_office.html @@ -1,18 +1,20 @@ {% extends 'partials/base.html' %} -{% load staticfiles %} {% load specializtions_tags %} {% load thumbnail %} + {% block content %} {% include 'partials/header.html' %} - +

Личный кабинет

- {% include 'partials/contractor_profile_tabs.html' with contractor_pk=request.user.pk active='groups' %} + + {% include 'partials/contractor_profile_tabs.html' %} +
-{% if contractor.is_owner_team %} -
-
-
-
-
- {% thumbnail contractor.avatar "265x264" crop="center" as im %} - profile-image - {% endthumbnail %} + + {% if contractor.is_owner_team %} +
+
+
+
+
+ {% thumbnail contractor.avatar "265x264" crop="center" as im %} + profile-image + {% endthumbnail %} +
-
- -
- - добавить участника - - -
-

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

- - {% for p in participants %} - -
- -
- {% thumbnail p.avatar "60x60" crop="center" as im %} - mess-image - {% endthumbnail %} + +
+ + добавить участника + + +
+

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

+ + {% for p in participants %} + +
+ +
+ {% thumbnail p.avatar "60x60" crop="center" as im %} + mess-image + {% endthumbnail %} +
+ +

+ {{ p.get_full_name }} +

+ + Программист
- -

- {{ p.get_full_name }} -

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

- {{ contractor.team }} -

-

Россия, Москва

- {#

На сайте 8 лет и 3 месяца

#} -

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

-

- Кол-во человек: {{ participants_count }} -

-

- Выполненных проектов: 0 -

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

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

+ +
+
+

+ {{ contractor.team }} +

+

Россия, Москва

+ {#

На сайте 8 лет и 3 месяца

#} +

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

+

+ Кол-во человек: {{ participants_count }} +

+

+ Выполненных проектов: 0 +

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

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

+
+ {% endif %}
- {% endif %}
-
- - -
-
- + + +
+
+ +
-
- -
-
- -
- {% for p in portfolios %} -
-
-
-
+ +
+
+ +
+ {% for p in portfolios %} +
+
+
+
+
-
-
- {{ p }} -
- -
- +
+ {{ p }} +
+ +
+ +
+ +
+
- -
-
-
- {% empty %} -
-

Работ в портфолио пока нет

-
- {% endfor %} - -
-{# TODO:#} -{#
#} -{#
#} -{# показать еще#} + {% empty %} +
+

Работ в портфолио пока нет

+
+ {% endfor %} + +
+{# TODO:#} +{#
#} +{#
#} +{# показать еще#} +{#
#} {#
#} -{#
#} -
- -
- -
- {% for ws in work_sells %} -
-
-
-
-
-
-
- {{ ws.budget }} +
+ +
+ +
+ {% for ws in work_sells %} +
+
+
+
+
+
+
+ {{ ws.budget }} +
+
+ {{ ws }} +
-
- {{ ws }} -
-
- {% empty %} -
-

Готовых работ пока нет

-
- {% endfor %} -
-{# TODO#} -{#
#} -{#
#} -{# показать еще#} + {% empty %} +
+

Готовых работ пока нет

+
+ {% endfor %} +
+{# TODO#} +{#
#} +{#
#} +{# показать еще#} +{#
#} {#
#} -{#
#} -
- -
- {% for review in reviews %} -
-
-

- {{ review.get_sender }} -

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

+ {{ review.get_sender }} +

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

+ {{ review.text|safe }} +

-

- {{ review.text|safe }} -

+ {% empty %} +
+

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

+
+ {% endfor %}
- {% empty %} -
-

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

-
- {% endfor %}
-
- - {% endif %} + {% endif %} + {% include 'partials/footer.html' %}
diff --git a/users/templates/contractor_office_open_projects.html b/users/templates/contractor_office_open_projects.html index dd29361..0805cab 100644 --- a/users/templates/contractor_office_open_projects.html +++ b/users/templates/contractor_office_open_projects.html @@ -1,9 +1,9 @@ {% extends 'partials/base.html' %} -{% load staticfiles %} {% load specializtions_tags %} {% load thumbnail %} + {% block content %} {% include 'partials/header.html' %} @@ -12,85 +12,103 @@

Личный кабинет

- {% include 'partials/contractor_profile_tabs.html' with contractor_pk=request.user.pk active='open' all_project_count=projects_count %} + + {% include 'partials/contractor_profile_tabs.html' %} +
-
- Все - Личные - От именни группы +
+ Все + Личные + От именни группы
-
- - + {{ archived_project_count }} +
+
- {% for proj in open_projects %} -
-
- -

- {{ proj }} -

+ {% for project in projects %} +
+
+ +

{{ project.name }}

 -
    -
  • - Объект "{{ proj.realty.name }}" -
    • -
-

-

-
    -
  • - {{ proj.created }} -
    • -
  • - 0 -
    • -
  • - 0 -
    • -
  • - {{ proj.customer.username }} -
    • -
-
-
-

- {{ proj.budget }} -

-
    - {% if proj.cro %} -
  • - Безопасная сделка -
    • + +
      +
    • Объект "{{ project.realty.name }}"
      • +
    + +

    {{ project.text|linebreaksbr|truncatechars:300 }}

    + + {% if TEMPLATE_DEBUG %} + 
    State: {{ project.state }}

    Specialization: {{ proj.specialization }}

    Realty location: {{ proj.realty.location }}

    Constr. type: {{ proj.realty.construction_type }}

    Build. classif.: {{ proj.realty.building_classification }}
    {% endif %} + +
      +
    • {{ project.created }}
      • +
    • {{ project.hit_count.hits }}
      • +
    • {{ project.answers.count }}
      • +
    • {{ project.customer.username }}
      • +
    +
+ +
+

+ {{ project.budget }} +

+ + -
-
+ + + +
+
{% endfor %}
- - + {% include 'partials/footer.html' %}
+ + {% endblock %} diff --git a/users/templates/contractor_office_open_projects_archive.html b/users/templates/contractor_office_open_projects_archive.html deleted file mode 100644 index a410993..0000000 --- a/users/templates/contractor_office_open_projects_archive.html +++ /dev/null @@ -1,95 +0,0 @@ -{% extends 'partials/base.html' %} - -{% load staticfiles %} -{% load specializtions_tags %} -{% load thumbnail %} - -{% block content %} - {% include 'partials/header.html' %} - -
-
-
-

Личный кабинет

-
- {% include 'partials/contractor_profile_tabs.html' with contractor_pk=request.user.pk active='open' all_project_count=projects_count %} -
-
- Все - Личные - От именни группы -
-
- - -
-
-
- {% for proj in open_projects %} -
-
- -

- {{ proj }} -

- -
    -
  • - Объект "{{ proj.realty.name }}" -
    • -
-

-

-
    -
  • - {{ proj.created }} -
    • -
  • - 0 -
    • -
  • - 0 -
    • -
  • - {{ proj.customer.username }} -
    • -
-
-
-

- {{ proj.budget }} -

- -
-
- {% endfor %} -
- - {% include 'partials/footer.html' %} -
-
-{% endblock %} diff --git a/users/templates/partials/contractor_profile_tabs.html b/users/templates/partials/contractor_profile_tabs.html index 81d36da..23fc9ec 100644 --- a/users/templates/partials/contractor_profile_tabs.html +++ b/users/templates/partials/contractor_profile_tabs.html @@ -1,30 +1,33 @@ +{% url 'users:contractor-office' pk=contractor.pk as contractor_office_url %} +{% url 'users:contractor-office-open-projects' pk=contractor.pk as contractor_office_open_projects_url %} +
- -
+ +
diff --git a/users/views.py b/users/views.py index 8e2017e..355a431 100644 --- a/users/views.py +++ b/users/views.py @@ -1,16 +1,14 @@ -from .models import ContractorResume, ContractorResumeFiles from django.conf import settings from django.contrib import messages +from django.core.exceptions import PermissionDenied from django.core.files.base import ContentFile from django.core.mail import send_mail from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger from django.core.urlresolvers import reverse from django.db.models import Q -from django.http import HttpResponse, HttpResponseForbidden -from django.http import JsonResponse, Http404 +from django.http import HttpResponse, HttpResponseForbidden, JsonResponse, Http404 from django.shortcuts import render, get_object_or_404, redirect from django.views.generic import ListView, DetailView, View, UpdateView, CreateView -from django.views.generic import UpdateView from pprint import pprint, pformat import itertools import json @@ -18,7 +16,7 @@ import natsort import pydash as _; _.map = _.map_; _.filter = _.filter_ from .mixins import CheckForUserMixin -from .models import User, Team, UserFinancialInfo +from .models import User, Team, UserFinancialInfo, ContractorResume, ContractorResumeFiles from .forms import TeamForm, ContractorResumeFilesForm, ContractorResumeForm from archilance import util from archilance.mixins import BaseMixin @@ -32,8 +30,8 @@ from work_sell.models import WorkSell, Picture from .forms import ( ContractorFilterForm, CustomerProfileProjectRealtyForm, - UserProfileBasicInfoEditForm, UserFinancialInfoEditForm, + UserProfileBasicInfoEditForm, UserProfileEditForm, ) @@ -46,7 +44,7 @@ class UserProfileEditView(BaseMixin, View): if request.user.is_authenticated() and request.user.pk == int(kwargs.get('pk')): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def get(self, request, *args, **kwargs): context = self.get_context_data(**_.merge({}, request.GET, kwargs)) @@ -90,7 +88,7 @@ class UserFinancialInfoEditView(BaseMixin, View): if request.user.is_authenticated() and request.user.pk == int(kwargs.get('pk')): return super().dispatch(request, *args, **kwargs) else: - return HttpResponseForbidden('403 Forbidden') + raise PermissionDenied def get(self, request, *args, **kwargs): context = self.get_context_data(**_.merge({}, request.GET, kwargs)) @@ -365,7 +363,7 @@ class ContractorOfficeDetailView(DetailView): template_name = 'contractor_office.html' context_object_name = 'contractor' form_team = TeamForm - + def get_context_data(self, **kwargs): context = super().get_context_data(**kwargs) context['form_team'] = TeamForm @@ -383,58 +381,50 @@ class ContractorOfficeDetailView(DetailView): return context -class ContractorOfficeOpenProjectsView(BaseMixin,View): +class ContractorOfficeOpenProjectsView(BaseMixin, View): template_name = 'contractor_office_open_projects.html' - - def get(self, request, *args, **kwargs): - context = self.get_context_data(**_.merge({},request.GET, kwargs)) - contractor = get_object_or_404(User.contractor_objects,pk=kwargs.get('pk')) - owner = request.GET.get('owner') - # import code; code.interact(local=dict(globals(), **locals())) - if owner and owner == 'private': - all_project_ids = [a.project.pk for a in contractor.contractor_answers.filter(is_archive=False)] - elif owner and owner == 'teams': - all_project_ids = [a.project.pk for a in contractor.team.answers.filter(is_archive=False)] + + def dispatch(self, request, *args, **kwargs): + # if request.user.is_authenticated() and request.user.is_contractor() and request.user.pk == int(kwargs.get('pk')): + if request.user.is_authenticated(): + return super().dispatch(request, *args, **kwargs) else: - team_project_ids = [a.project.pk for a in contractor.team.answers.filter(is_archive=False)] - contractor_project_ids = [a.project.pk for a in contractor.contractor_answers.filter(is_archive=False)] - all_project_ids = contractor_project_ids + team_project_ids - - open_projects = Project.objects.filter(pk__in=all_project_ids) - archive_contractor_count = contractor.contractor_answers.filter(is_archive=True).count() - archive_team_count = contractor.team.answers.filter(is_archive=True).count() - archive_count = archive_contractor_count + archive_team_count - context.update({ - 'open_projects': open_projects, - 'projects_count': len(open_projects), - 'current_projects_count': len(open_projects), - 'archive_count': archive_count, - }) - return render(request, self.template_name, context) - - -class ContractorOfficeOpenProjectsArchiveView(BaseMixin,View): - template_name = 'contractor_office_open_projects_archive.html' - + raise PermissionDenied + def get(self, request, *args, **kwargs): - context = self.get_context_data(**_.merge({},request.GET, kwargs)) - contractor = get_object_or_404(User.contractor_objects,pk=kwargs.get('pk')) - owner = request.GET.get('owner') - # import code; code.interact(local=dict(globals(), **locals())) - if owner and owner == 'private': - all_project_ids = [a.project.pk for a in contractor.contractor_answers.all()] - elif owner and owner == 'teams': - all_project_ids = [a.project.pk for a in contractor.team.answers.all()] + context = self.get_context_data(**kwargs) + + contractor = get_object_or_404(User.contractor_objects, pk=kwargs.get('pk')) + context['contractor'] = contractor + + private_projects = tuple(a.project for a in contractor.contractor_answers.all()) + private_project_count = len(private_projects) + + team_projects = tuple(a.project for a in contractor.team.answers.all()) + team_project_count = len(team_projects) + + context['all_project_count'] = private_project_count + team_project_count + + if request.GET.get('owner') == 'private': + projects = private_projects + elif request.GET.get('owner') == 'teams': + projects = team_projects else: - team_project_ids = [a.project.pk for a in contractor.team.answers.all()] - contractor_project_ids = [a.project.pk for a in contractor.contractor_answers.all()] - all_project_ids = contractor_project_ids + team_project_ids - - open_projects = Project.objects.filter(pk__in=all_project_ids) - context.update({ - 'open_projects': open_projects, - 'projects_count': len(open_projects), - }) + projects = itertools.chain(private_projects, team_projects) + + active_projects = _.filter(projects, lambda p: p.state == 'active') + context['active_project_count'] = len(active_projects) + + archived_projects = _.filter(projects, lambda p: p.state == 'trashed') + context['archived_project_count'] = len(archived_projects) + + if request.GET.get('archived') == 'on': + projects = archived_projects + else: + projects = active_projects + + context['projects'] = projects + return render(request, self.template_name, context) @@ -644,3 +634,4 @@ class CustomerProfileReviewsView(BaseMixin, View): return render(request, self.template_name, context) +# import code; code.interact(local=dict(globals(), **locals()))