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

Merge

Browse Source
remotes/origin/PR-39
ArturBaybulatov 10 years ago
parent b7db81918c cc7446fc47
commit 31dc2ccdea
30 changed files with 570 additions and 338 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      archilance/settings/base.py
  2. 2
      archilance/urls.py
  3. 29
      chat/templates/chat_contractor.html
  4. 35
      chat/templates/chat_customer.html
  5. 3
      chat/views.py
  6. 1
      common/models.py
  7. 2
      projects/migrations/0006_merge.py
  8. 6
      templates/partials/footer.html
  9. 8
      templates/partials/header.html
  10. 21
      templates/password_reset/recovery_done.html
  11. 2
      templates/password_reset/recovery_email.txt
  12. 16
      templates/password_reset/recovery_form.html
  13. 39
      templates/password_reset/reset.html
  14. 29
      templates/password_reset/reset_sent.html
  15. 12
      templates/registration/login.html
  16. 10
      templates/registration/logout.html
  17. 28
      users/templates/contractor_filter.html
  18. 2
      users/templates/contractor_office.html
  19. 16
      users/templates/contractor_profile.html
  20. 5
      users/templates/partials/customer_profile_info_block.html
  21. 10
      users/templates/user_financial_info_edit.html
  22. 5
      users/templates/user_profile_edit.html
  23. 2
      users/urls.py
  24. 6
      users/views.py
  25. 29
      work_sell/forms.py
  26. 22
      work_sell/templates/worksell_detail.html
  27. 2
      work_sell/templates/worksell_edit.html
  28. 117
      work_sell/templates/worksells_list.html
  29. 3
      work_sell/urls.py
  30. 73
      work_sell/views.py

1
archilance/settings/base.py
Unescape View File

@ -224,6 +224,7 @@ AUTH_USER_MODEL = 'users.User'
ACCOUNT_ACTIVATION_DAYS = 7 ACCOUNT_ACTIVATION_DAYS = 7
REGISTRATION_AUTO_LOGIN = True REGISTRATION_AUTO_LOGIN = True
LOGIN_REDIRECT_URL = '/projects/' LOGIN_REDIRECT_URL = '/projects/'
LOGIN_URL = '/users/login/'
if DEBUG: if DEBUG:
EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend' EMAIL_BACKEND = 'django.core.mail.backends.dummy.EmailBackend'

2
archilance/urls.py
Unescape View File

@ -7,7 +7,6 @@ from django.views.generic import TemplateView
from .views import HomeTemplateView, TestChatTemplateView from .views import HomeTemplateView, TestChatTemplateView
urlpatterns = [ urlpatterns = [
url(r'^$', HomeTemplateView.as_view()), url(r'^$', HomeTemplateView.as_view()),
url('', include('social.apps.django_app.urls', namespace='social')), url('', include('social.apps.django_app.urls', namespace='social')),
@ -21,6 +20,7 @@ urlpatterns = [
url(r'^specializations/', include('specializations.urls')), url(r'^specializations/', include('specializations.urls')),
url(r'^users/', include('users.urls')), url(r'^users/', include('users.urls')),
url(r'^common/', include('common.urls')), url(r'^common/', include('common.urls')),
url(r'^password/', include('password_reset.urls')),
url(r'^users/', include('registration.backends.default.urls')), url(r'^users/', include('registration.backends.default.urls')),
url(r'^admin/', admin.site.urls), url(r'^admin/', admin.site.urls),

29
chat/templates/chat_contractor.html
Unescape View File

@ -49,7 +49,22 @@
<p class="nameMess"> <p class="nameMess">
<div><a href="#" style="color:black;">{{ contact.username }}</a></div> <div><a href="#" style="color:black;">{{ contact.username }}</a></div>
</p> </p>
<a href="javascript:void(0)" class="conMess">Контакты</a>
<div class="modal fade" id="userModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" type="button" data-dismiss="modal">x</button>
<h4 class="modal-title" id="myModalLabel">Название модального
окна</h4>
</div>
<div class="modal-body">
<h3>Содержимое модального окна</h3>
</div>
</div>
</div>
</div>
<a href="#" data-target="#userModal" data-toggle="modal" class="conMess">Контакты</a>
<span>0</span> <span>0</span>
<a href="javascript:void(0)" class="deleteMess"> <a href="javascript:void(0)" class="deleteMess">
@ -94,7 +109,8 @@
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Заказы</p> <p>Заказы</p>
{% for order in orders %} {% for order in orders %}
<div class="orderBlock box-sizing order-block" data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}"> <div class="orderBlock box-sizing order-block"
data-recipent-id="{{ order.project.customer.pk }}" data-id="{{ order.id }}">
<span class="dimovChat"></span> <span class="dimovChat"></span>
<p class="titleOB">{{ order }}</p> <p class="titleOB">{{ order }}</p>
<div class="hideOBB"> <div class="hideOBB">
@ -171,7 +187,8 @@
<div class="messageBlock box-sizing disTab"> <div class="messageBlock box-sizing disTab">
<p>Заказы</p> <p>Заказы</p>
{% for torder in team_orders %} {% for torder in team_orders %}
<div class="team-order-block orderBlock box-sizing" data-team-id="{{ torder.team.pk }}" data-order-id="{{ torder.pk}}"> <div class="team-order-block orderBlock box-sizing"
data-team-id="{{ torder.team.pk }}" data-order-id="{{ torder.pk }}">
<span class="dimovChat"></span> <span class="dimovChat"></span>
<p class="titleOB"> <p class="titleOB">
{{ torder }} {{ torder }}
@ -191,7 +208,8 @@
<span>Чаты:</span> <span>Чаты:</span>
{% for tuser in torder.team.users.all %} {% for tuser in torder.team.users.all %}
{% if request.user.pk != tuser.pk %} {% if request.user.pk != tuser.pk %}
<span class="team-chat-user" data-id="{{ tuser.pk }}">{{ tuser.username }},</span> <span class="team-chat-user"
data-id="{{ tuser.pk }}">{{ tuser.username }},</span>
{% endif %} {% endif %}
{% endfor %} {% endfor %}
</p> </p>
@ -354,7 +372,8 @@
} }
}, },
dataType: 'json', dataType: 'json',
done: function (e, data) {; done: function (e, data) {
;
$.each(data.result.files, function (index, file) { $.each(data.result.files, function (index, file) {
var currentValue = $("#documentSendIds").val(); var currentValue = $("#documentSendIds").val();
currentValue += file.id + ';'; currentValue += file.id + ';';

35
chat/templates/chat_customer.html
Unescape View File

@ -32,14 +32,21 @@
{% for contact in contacts_users %} {% for contact in contacts_users %}
<div class="message messd user-block" data-id="{{ contact.pk }}"> <div class="message messd user-block" data-id="{{ contact.pk }}">
<div class="imgMess"> <div class="imgMess">
{% if contact.avatar %}
{% thumbnail contact.avatar "60x60" crop="center" as im %} {% thumbnail contact.avatar "60x60" crop="center" as im %}
<img src="{{ im.url }}" alt="mess-image"> <img src="{{ im.url }}" alt="mess-image">
{% endthumbnail %} {% endthumbnail %}
{% else %}
<img src="{% static 'img/profile.jpg' %}" alt="mess-image">
{% endif %}
</div> </div>
<p class="nameMess"> <p class="nameMess">
<a href="#">{{ contact.username }} {{ contact.username }}</a> <div><a href="#">{{ contact.username }}</a></div>
</p> </p>
<a href="javascript:void(0)" class="conMess">Контакты</a>
<a href="#" data-target="#userModal" data-toggle="modal"
class="conMess">Контакты</a>
<span>0</span> <span>0</span>
<a href="javascript:void(0)" class="deleteMess"> <a href="javascript:void(0)" class="deleteMess">
Удалить контакт Удалить контакт
@ -48,6 +55,20 @@
{% endfor %} {% endfor %}
</div> </div>
</div>
<div class="modal fade" id="userModal" tabindex="-1" role="dialog">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button class="close" type="button" data-dismiss="modal">x</button>
<h4 class="modal-title" id="myModalLabel">Название модального
окна</h4>
</div>
<div class="modal-body">
<h3>Содержимое модального окна</h3>
</div>
</div>
</div>
</div> </div>
<div class="col-lg-6 commChat" id="contact-chat"> <div class="col-lg-6 commChat" id="contact-chat">
<div id="message-chat-space"> <div id="message-chat-space">
@ -226,8 +247,10 @@
<div class="textAreaBlock2 text-nn box-sizing disTab"> <div class="textAreaBlock2 text-nn box-sizing disTab">
<textarea cols="40" name="text" rows="10"></textarea> <textarea cols="40" name="text" rows="10"></textarea>
<input type="hidden" name="from_customer" value="{{ request.user.pk }}" /> <input type="hidden" name="from_customer"
<input type="hidden" name="target_contractor" id="targetContractorId" /> value="{{ request.user.pk }}"/>
<input type="hidden" name="target_contractor"
id="targetContractorId"/>
<input type="hidden" name="project" id="projectReviewId"/> <input type="hidden" name="project" id="projectReviewId"/>
</div> </div>
</div> </div>
@ -236,7 +259,9 @@
<div class="modal-footer"> <div class="modal-footer">
<button type="button" class="btn btn-default" data-dismiss="modal">Закрыть <button type="button" class="btn btn-default" data-dismiss="modal">Закрыть
</button> </button>
<button type="submit" id="order-review-add" class="btn btn-primary">Оставить отзыв</button> <button type="submit" id="order-review-add" class="btn btn-primary">Оставить
отзыв
</button>
</div> </div>
</form> </form>

3
chat/views.py
Unescape View File

@ -2,6 +2,7 @@ from django.shortcuts import render
from django.views.generic import View from django.views.generic import View
from django.db.models import Q from django.db.models import Q
from django.forms import formset_factory from django.forms import formset_factory
from django.contrib.auth.mixins import LoginRequiredMixin
from .models import Message from .models import Message
from .forms import ArticleForm from .forms import ArticleForm
@ -9,7 +10,7 @@ from reviews.forms import Review
from users.models import User from users.models import User
class ChatUserView(View): class ChatUserView(LoginRequiredMixin, View):
template_name = '' template_name = ''
def get(self, request, *args, **kwargs): def get(self, request, *args, **kwargs):

1
common/models.py
Unescape View File

@ -43,6 +43,7 @@ class Settings(models.Model):
document_send_time_remove = models.IntegerField(default=14) document_send_time_remove = models.IntegerField(default=14)
recalculation_spec_time = models.TimeField() recalculation_spec_time = models.TimeField()
recalculation_rating_time = models.TimeField() recalculation_rating_time = models.TimeField()
# worksell_count = models.PositiveIntegerField(default=20)
def __str__(self): def __str__(self):
return 'Настройки сайта' return 'Настройки сайта'

2
projects/migrations/0006_merge.py
Unescape View File

@ -1,5 +1,5 @@
# -*- coding: utf-8 -*- # -*- coding: utf-8 -*-
# Generated by Django 1.9.7 on 2016-08-15 08:24 # Generated by Django 1.9.7 on 2016-08-15 10:48
from __future__ import unicode_literals from __future__ import unicode_literals
from django.db import migrations from django.db import migrations

6
templates/partials/footer.html
Unescape View File

@ -24,15 +24,15 @@
</li> </li>
<li> <li>
<a href="">Регистрация</a> <a href="{% url 'registration_register' %}">Регистрация</a>
</li> </li>
<li> <li>
<a href="">Востановить доступ</a> <a href="{% url 'password_reset_recover' %}">Востановить доступ</a>
</li> </li>
<li> <li>
<a href="">Опубликовать проект</a> <a href="{% url 'projects:customer-project-create' %}">Опубликовать проект</a>
</li> </li>
</ul> </ul>
</div> </div>

8
templates/partials/header.html
Unescape View File

@ -47,7 +47,7 @@
<span></span> <span></span>
</li> </li>
<li class="icon_tm3"> <li class="icon_tm3">
<a href="#">Работы на продажу</a> <a href="{% url 'work_sell:list' %}">Работы на продажу</a>
<span></span> <span></span>
</li> </li>
</ul> </ul>
@ -108,9 +108,15 @@
<li class="icon_mm5"> <li class="icon_mm5">
<a href="#">Настройки<span></span></a> <a href="#">Настройки<span></span></a>
</li> </li>
<li class="icon_mm6"> <li class="icon_mm6">
<a href="#">FAQ<span></span></a> <a href="#">FAQ<span></span></a>
</li> </li>
<li class="icon_mm6">
<a href="{% url 'auth_logout' %}">Выйти<span></span></a>
</li>
</ul> </ul>
</div> </div>
</div> </div>

21
templates/password_reset/recovery_done.html
Unescape View File

@ -3,18 +3,21 @@
{% block title %}{% trans "New password set" %}{% endblock %} {% block title %}{% trans "New password set" %}{% endblock %}
{% block content %} {% block content %}
{% include 'partials/header.html' %}
<div class="container container_1200"> <div class="container mainScore">
<hr> <div class="row">
<div class="col-lg-12">
<p class="titleScore">Успех</p>
</div> </div>
<!-- block_registr --> <div class="col-lg-12">
<div class="container container_1200">
<div class="block_registr" style="height: auto;">
<div class="text-center registr">Успех</div>
{% trans "Your password has successfully been reset. You can use it right now on the login page." %} {% trans "Your password has successfully been reset. You can use it right now on the login page." %}
</div> </div>
{% include 'partials/footer.html' %}
</div>
</div> </div>
<!-- block_registr end -->
{% endblock %} {% endblock %}

2
templates/password_reset/recovery_email.txt
Unescape View File

@ -4,6 +4,6 @@
{% trans "You can set your new password by following this link:" %} {% trans "You can set your new password by following this link:" %}
http{% if secure %}s{% endif %}://{{ site.domain }} http{% if secure %}s{% endif %}://{{ site.domain }}{% url "password_reset_reset" token %}
{% trans "If you don't want to reset your password, simply ignore this email and it will stay unchanged." %} {% trans "If you don't want to reset your password, simply ignore this email and it will stay unchanged." %}

16
templates/password_reset/recovery_form.html
Unescape View File

@ -5,16 +5,20 @@
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
<div class="container mainScore">
<div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleScore">Восстановление пароля</p> <p class="titleScore">Восстановление пароля</p>
</div> </div>
<div class="form-regestration">
<div class="form-regestration" style="padding-top:10px;">
<form method="post" action="{{ url }}"> <form method="post" action="{{ url }}">
{% csrf_token %} {% csrf_token %}
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="email" name="{{ form.username_or_email.name }}" class="box-sizing pass-reg" id="inputEmail" <input type="email" name="{{ form.username_or_email.name }}" class="box-sizing pass-reg"
id="inputEmail"
placeholder="Электронная почта"> placeholder="Электронная почта">
<p>{{ form.username_or_email.errors.as_text }}</p> <p>{{ form.username_or_email.errors.as_text }}</p>
</div> </div>
@ -25,5 +29,13 @@
</button> </button>
</div> </div>
</form> </form>
<div class="col-lg-12 select-reg">
<p></p>
</div> </div>
</div>
{% include 'partials/footer.html' %}
</div>
</div>
{% endblock %} {% endblock %}

39
templates/password_reset/reset.html
Unescape View File

@ -1,46 +1,55 @@
{% extends "password_reset/base.html" %}{% load i18n %} {% extends "password_reset/base.html" %}{% load i18n %}
{% block content %} {% block content %}
<div class="container container_1200"> {% include 'partials/header.html' %}
<hr> <div class="container mainScore">
<div class="row">
<div class="col-lg-12">
<p class="titleScore">Сброс пароля</p>
</div> </div>
<!-- block_registr -->
<div class="container container_1200">
<div class="block_registr" style="height: auto;">
<div class="text-center registr">Сброс пароля</div>
{% if invalid %}{% url "password_reset_recover" as recovery_url %} {% if invalid %}{% url "password_reset_recover" as recovery_url %}
<div class="col-lg-12">
{% blocktrans %}Sorry, this password reset link is invalid. You can still {% blocktrans %}Sorry, this password reset link is invalid. You can still
<a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %} <a href="{{ recovery_url }}">request a new one</a>.{% endblocktrans %}
</div>
{% else %} {% else %}
{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.{% endblocktrans %}
<div class="form-regestration" style="padding-top:10px;">
{% blocktrans %}Hi, <strong>{{ username }}</strong>. Please choose your new password.
{% endblocktrans %}
<form method="post" action="{% url "password_reset_reset" token %}"> <form method="post" action="{% url "password_reset_reset" token %}">
{% csrf_token %} {% csrf_token %}
<div class="form-group"> <div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password1.name }}" class="col-xs-10 form-control" id="id_password1" <input type="password" name="{{ form.password1.name }}" class="box-sizing pass-reg"
id="id_password1"
placeholder="Новый пароль"> placeholder="Новый пароль">
<p>{{ form.password1.errors.as_text }}</p> <p>{{ form.password1.errors.as_text }}</p>
</div> </div>
<div class="form-group">
<input type="password" name="{{ form.password2.name }}" class="col-xs-10 form-control" id="id_password2" <div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password2.name }}" class="box-sizing pass-reg"
id="id_password2"
placeholder="Подтверждение"> placeholder="Подтверждение">
<p>{{ form.password2.errors.as_text }}</p> <p>{{ form.password2.errors.as_text }}</p>
</div> </div>
<div> <div class="col-lg-12 select-reg">
<button type="submit" class="btn registr_button"> <button type="submit" class="reg-sub">
Изменить пароль Изменить пароль
</button> </button>
</div> </div>
</form> </form>
</div>
{% endif %} {% endif %}
{% include 'partials/footer.html' %}
</div> </div>
</div> </div>
<!-- block_registr end -->
{% endblock %} {% endblock %}

29
templates/password_reset/reset_sent.html
Unescape View File

@ -3,26 +3,21 @@
{% block title %}{% trans "Password recovery sent" %}{% endblock %} {% block title %}{% trans "Password recovery sent" %}{% endblock %}
{#{% block content %}#}
{# <p></p>#}
{#{% endblock %}#}
{% block content %} {% block content %}
{% include 'partials/header.html' %}
<div class="container container_1200"> <div class="container mainScore">
<hr> <div class="row">
<div class="col-lg-12">
<p class="titleScore">Письмо отправлено</p>
</div> </div>
<!-- block_registr -->
<div class="container container_1200">
<div class="block_registr" style="height: 300px;"> <div class="block_registr" style="height: 300px;">
<div class="text-center registr">Письмо отправлено</div> {% blocktrans with ago=timestamp|timesince %}An email was sent to <strong>{{ email }}</strong>
{# <div class="alert alert-success">#} {{ ago }} ago. Use the link in it to set a new password.{% endblocktrans %}
{% blocktrans with ago=timestamp|timesince %}An email was sent to <strong>{{ email }}</strong> {{ ago }} ago. Use the link in it to set a new password.{% endblocktrans %} </div>
{% include 'partials/footer.html' %}
</div> </div>
{# </div>#}
</div> </div>
<!-- block_registr end -->
{% endblock %} {% endblock %}

12
templates/registration/login.html
Unescape View File

@ -11,12 +11,20 @@
{{ form.errors }} {{ form.errors }}
<form method="post">{% csrf_token %} <form method="post">{% csrf_token %}
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="text" name="{{ form.username.name }}" class="box-sizing email-reg" <input type="text" name="{{ form.username.name }}" value="{{ form.username.value }}" class="box-sizing email-reg"
placeholder="Электронная почта"> placeholder="Электронная почта">
</div> </div>
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<input type="password" name="{{ form.password.name }}" class="box-sizing pass-reg" placeholder="Пароль"> <input type="password" name="{{ form.password.name }}" value="{{ form.password.value }}"class="box-sizing pass-reg" placeholder="Пароль">
</div> </div>
<div class="col-lg-12 select-reg">
<div class="check-reg">
<label><input type="checkbox" name="check-reg"><span></span></label>
<p>Запомнить</p>
<p><a href="{% url 'password_reset_recover' %}">Забыли пароль ?</a></p>
</div>
</div>
<div class="col-lg-12 select-reg"> <div class="col-lg-12 select-reg">
<button class="reg-sub">Вход</button> <button class="reg-sub">Вход</button>
</div> </div>

10
templates/registration/logout.html
Unescape View File

@ -1,7 +1,15 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% block content %} {% block content %}
{% include 'partials/header.html' %}
<div class="container mainScore">
<div class="row">
<div class="col-lg-12"> <div class="col-lg-12">
<p class="titleScore">Выход</p> <p class="titleScore">Вы вышли</p>
</div> </div>
{% include 'partials/footer.html' %}
</div>
</div>
{% endblock %} {% endblock %}

28
users/templates/contractor_filter.html
Unescape View File

@ -1,6 +1,8 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load common_tags %} {% load common_tags %}
{% load specializtions_tags %}
{% load thumbnail %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
@ -213,14 +215,6 @@
<span>Интерьеры</span> <span>Интерьеры</span>
<span>2-й</span> <span>2-й</span>
</div> </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="showSpec">
<div class="insetSpec"> <div class="insetSpec">
<span>Архитектура</span> <span>Архитектура</span>
@ -313,11 +307,21 @@
{% with contractor=obj %} {% with contractor=obj %}
<div class="executorBlock clearfix"> <div class="executorBlock clearfix">
<div class="col-lg-4"> <div class="col-lg-4">
<a href="#" class="aLinkExe"><div class="imgExecutor"> <a href="{% url 'users:contractor-profile' pk=obj.pk %}" class="aLinkExe">
<img src="img/profile.jpg" alt="execitor-image"> <div class="imgExecutor">
</div></a>
{% if contractor.avatar %}
{% 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 %}
</div>
</a>
<p class="nameExecutor"> <p class="nameExecutor">
<a href="#">{{ contractor.get_full_name }} [{{ contractor.username }}]</a> <a href="{% url 'users:contractor-profile' pk=obj.pk %}">{{ contractor.get_full_name }} [{{ contractor.username }}]</a>
</p> </p>
<p class="navv2">На сайте 8 лет и 3 месяца</p> <p class="navv2">На сайте 8 лет и 3 месяца</p>
<div class="statusUser">Свободен</div> <div class="statusUser">Свободен</div>

2
users/templates/contractor_office.html
Unescape View File

@ -16,7 +16,7 @@
<div class="profileTabs"> <div class="profileTabs">
<ul class="nav nav-tabs nav-justified"> <ul class="nav nav-tabs nav-justified">
<li role="presentation"> <li role="presentation">
<a href="#">Поиск исполнителей</a> <a href="{% url 'users:contractor-filter' %}">Поиск исполнителей</a>
</li> </li>
<li role="presentation" class="active"> <li role="presentation" class="active">

16
users/templates/contractor_profile.html
Unescape View File

@ -71,7 +71,7 @@
<div class="statusUser">Свободен</div> <div class="statusUser">Свободен</div>
{% endif %} {% endif %}
<a href="javascript:void(0)" class="showCon">показать контакты</a> <a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="showCon">показать контакты</a>
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
{% specialization_widget contractor.pk %} {% specialization_widget contractor.pk %}
@ -87,6 +87,20 @@
{% endif %} {% endif %}
</div>
</div>
<div id="contact-contactor-modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
<h2>Здесь находятся контакты владельца</h2>
</div>
</div>
</div> </div>
</div> </div>
<div class="col-lg-9"> <div class="col-lg-9">

5
users/templates/partials/customer_profile_info_block.html
Unescape View File

@ -27,9 +27,12 @@
</div> </div>
<div class="col-lg-4"> <div class="col-lg-4">
{% if request.user.pk != customer.pk %}
<a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a> <a href="javascript:void(0)" class="new-prop new-prop1">показать контакты</a>
<a href="javascript:void(0)" class="new-prop new-prop2">написать сообщение</a> <a href="{% url 'chat:chat-user' %}?user_id={{ pk }}" class="new-prop new-prop2">написать сообщение</a>
{% else %}
<a href="{% url 'users:user-profile-edit' pk=pk %}" class="new-red">редактировать профиль</a> <a href="{% url 'users:user-profile-edit' pk=pk %}" class="new-red">редактировать профиль</a>
{% endif %}
</div> </div>
</div> </div>

10
users/templates/user_financial_info_edit.html
Unescape View File

@ -1,6 +1,6 @@
{% extends 'partials/base.html' %} {% extends 'partials/base.html' %}
{% load thumbnail %}
{% block content %} {% block content %}
{% include 'partials/header.html' %} {% include 'partials/header.html' %}
@ -20,7 +20,13 @@
<div class="col-lg-3 divCol3"> <div class="col-lg-3 divCol3">
<div class="avatar"> <div class="avatar">
<div class="avatarInset"> <div class="avatarInset">
<img src="{{ form.avatar.value.url }}" alt="profile-image"> {% if form.avatar.value %}
{% thumbnail form.avatar.value "235x224" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% endif %}
</div> </div>
</div> </div>
<div class="menuUser upload-img disTab"> <div class="menuUser upload-img disTab">

5
users/templates/user_profile_edit.html
Unescape View File

@ -23,7 +23,10 @@
<div class="avatar"> <div class="avatar">
<div class="avatarInset"> <div class="avatarInset">
{% if form.avatar.value %} {% if form.avatar.value %}
<img src="{{ form.avatar.value.url }}" alt="profile-image"> {% thumbnail form.avatar.value "235x224" crop="center" as im %}
<img src="{{ im.url }}" alt="profile-image">
{% endthumbnail %}
{% endif %} {% endif %}
</div> </div>
</div> </div>

2
users/urls.py
Unescape View File

@ -23,7 +23,7 @@ from .views import (
app_name = 'users' app_name = 'users'
urlpatterns = [ urlpatterns = [
urls.url(r'^password/', include('password_reset.urls')),
urls.url(r'^(?P<pk>\d+)/edit/$', UserProfileEditView.as_view(), name='user-profile-edit'), urls.url(r'^(?P<pk>\d+)/edit/$', UserProfileEditView.as_view(), name='user-profile-edit'),
urls.url(r'^(?P<pk>\d+)/financial-info/edit/$', UserFinancialInfoEditView.as_view(), name='user-financial-info-edit'), urls.url(r'^(?P<pk>\d+)/financial-info/edit/$', UserFinancialInfoEditView.as_view(), name='user-financial-info-edit'),

6
users/views.py
Unescape View File

@ -204,7 +204,8 @@ class ContractorFilterView(BaseMixin, View):
if get_contractors: if get_contractors:
contractors = User.contractor_objects.filter(cro=cro) # contractors = User.contractor_objects.filter(cro=cro)
contractors = User.contractor_objects
if specialization: if specialization:
contractors = contractors.filter( contractors = contractors.filter(
@ -230,7 +231,8 @@ class ContractorFilterView(BaseMixin, View):
if get_teams: if get_teams:
teams = Team.objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro)) # teams = Team.objects.filter(Q(contractors__cro=cro) | Q(owner__cro=cro))
teams = Team.objects
if specialization: if specialization:
teams = teams.filter( teams = teams.filter(

29
work_sell/forms.py
Unescape View File

@ -1,7 +1,9 @@
import itertools
from django import forms from django import forms
from common.models import Location from common.models import Location
from .models import WorkSell from .models import WorkSell
from specializations.models import Specialization
class ContractorWorkSellTrashForm(forms.Form): class ContractorWorkSellTrashForm(forms.Form):
@ -42,5 +44,32 @@ class WorkSellForm(forms.ModelForm):
# self.request = kwargs.pop('request') # self.request = kwargs.pop('request')
super().__init__(*args, **kwargs) super().__init__(*args, **kwargs)
self.fields['specialization'].queryset = Specialization.objects.root_nodes()[0].get_descendants()
self.fields['location'].queryset = Location.objects.root_nodes()[0].get_descendants() self.fields['location'].queryset = Location.objects.root_nodes()[0].get_descendants()
# self.fields['location'].queryset = Location.objects # Migrate with this enabled # self.fields['location'].queryset = Location.objects # Migrate with this enabled
class WorkSellFilterForm(forms.ModelForm):
keywords = forms.CharField(required=False, max_length=255)
class Meta:
model = WorkSell
fields = (
'location',
'building_classification',
'construction_type',
'specialization',
)
widgets = {
'building_classification': forms.Select(attrs={'class': 'selectpicker'}),
'construction_type': forms.Select(attrs={'class': 'selectpicker'}),
}
def __init__(self, *args, **kwargs):
self.request = kwargs.pop('request')
super().__init__(*args, **kwargs)
self.fields['specialization'].required = False
self.fields['specialization'].queryset = Specialization.objects.root_nodes()[0].get_descendants()

22
work_sell/templates/worksell_detail.html
Unescape View File

@ -25,37 +25,27 @@
<div class="col-lg-3"> <div class="col-lg-3">
<p class="cenaReady">{{ object.budget }} <i class="fa fa-rub"></i></p> <p class="cenaReady">{{ object.budget }} <i class="fa fa-rub"></i></p>
</div> </div>
{% if request.user.is_authenticated %}
<div class="col-lg-3"> <div class="col-lg-3">
<a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR1"> <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR1">
купить купить
</a> </a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="{% url 'chat:chat-user' %}" class="linkReady LR2"> <a href="{% url 'chat:chat-user' %}?user_id={{ object.contractor.pk }}" class="linkReady LR2">
Написать сообщение Написать сообщение
</a> </a>
</div> </div>
{% endif %}
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" data-toggle="modal" data-target="#contact-contactor-modal" class="linkReady LR3"> <a href="{% url 'users:contractor-profile' object.contractor.pk %}" class="linkReady LR3">
посмотреть контакты посмотреть контакты
</a> </a>
</div> </div>
</div> </div>
<div id="contact-contactor-modal" class="modal fade">
<div class="modal-dialog">
<div class="modal-content">
<div class="modal-header">
<button type="button" class="close" data-dismiss="modal" aria-hidden="true">×
</button>
<h4 class="modal-title">Контакты владельца </h4>
</div>
<div class="modal-body">
<h2>Здесь находятся контакты владельца</h2>
</div>
</div>
</div>
</div>
<div class="desReadyBlock"> <div class="desReadyBlock">
<div class="col-lg-10 col-lg-offset-1"> <div class="col-lg-10 col-lg-offset-1">

2
work_sell/templates/worksell_edit.html
Unescape View File

@ -84,7 +84,7 @@
</div> </div>
<div class="polsF1 polsF2 disTab"> <div class="polsF1 polsF2 disTab">
{% form.ins %}
</div> </div>
<div class="searchF1 polsF1 polsFF links-filter"> <div class="searchF1 polsF1 polsFF links-filter">

117
work_sell/templates/worksells_list.html
Unescape View File

@ -13,56 +13,57 @@
</div> </div>
<form action="{{ request.path }}" method="GET" novalidate> <form action="{% url 'work_sell:list' %}" method="GET" novalidate>
<div class="col-lg-12"> <div class="col-lg-12">
<div class="filter clearfix"> <div class="filter clearfix">
<div class="triangle1"></div> <div class="triangle1"></div>
<div class="titleF1 disTab"> <div class="titleF1 disTab">
<div class="col-lg-3">Специализации:</div> <div class="col-lg-3">Специализации</div>
<div class="col-lg-3"></div> <div class="col-lg-9"></div>
<div class="col-lg-3"></div>
<div class="col-lg-3"></div>
</div> </div>
<div class="polsF1 disTab"> <div class="polsF1 disTab">
<div class="col-lg-3"> <div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-1" style="width: 100%"> <input type="hidden" class="-spec-select -spec-select-level-1" style="width: 100%">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-2" style="width: 100%"> <input type="hidden" class="-spec-select -spec-select-level-2" style="width: 100%">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-3" style="width: 100%"> <input type="hidden" class="-spec-select -spec-select-level-3" style="width: 100%">
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<input type='hidden' class="-spec-select -spec-select-level-4" style="width: 100%"> <input type="hidden" class="-spec-select -spec-select-level-4" style="width: 100%">
</div> </div>
<input type="hidden" id="chosenSpecId" name="{{ form.specialization.html_name }}" value="{{ form.specialization.value }}">
</div> </div>
<div class="titleF1 titleF2 disTab">
<div class="col-lg-4">Тип работ:</div>
<div class="col-lg-8"></div> <div class="searchF1">
</div> <div class="col-lg-6">
<div class="searchF1 polsF1 polsFF"> <input
<div class="col-lg-4"> type="text"
<input type="text" placeholder="От" name="from_budget" class="box-sizing otInp"> name="keywords"
<input type="text" placeholder="До" name="to_budget" class="box-sizing otInp"> onkeydown="event.keyCode === 13 && $(this).closest('form').submit()"
<select class="selectpicker2 valul"> value="{{ form.keywords.value }}"
<option>&#36;</option> class="searchInp box-sizing"
<option>&#36;</option> placeholder="Ключевые слова">
<option>&#36;</option>
</select>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<a href="#" class="findReal" onclick="$(this).closest('form').submit(); return false">
найти проект
</a>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<button type="submit" class="findReal">Поиск</button> <a href="{% url 'work_sell:list' %}" class="clearSearch">
</div>
<div class="col-lg-2">
<a href="javascript:void(0)" class="clearSearch">
Очистить фильтр Очистить фильтр
</a> </a>
</div> </div>
</div> </div>
<div class="resSearchF1"> <div class="resSearchF1">
<div class="col-lg-3"> <div class="col-lg-3">
<p class="titleResF1">Расширенный поиск</p> <p class="titleResF1">Расширенный поиск</p>
@ -74,47 +75,69 @@
<div class="borderS1"></div> <div class="borderS1"></div>
</div> </div>
</div> </div>
<div class="slideRes disTab activeSlide"> <div class="slideRes disTab activeSlide">
<div class="titleF1 disTab"> <div class="titleF1 disTab">
<div class="col-lg-3">Классификация</div> <div class="col-lg-3">Классификация здания</div>
<div class="col-lg-3">Вид строительства:</div> <div class="col-lg-3">Вид строительства</div>
<div class="col-lg-3">Местоположение:</div>
<div class="col-lg-3"></div> <div class="col-lg-3"></div>
</div> </div>
<div class="polsF1 polsF2 disTab">
<div class="polsF1 disTab">
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker" name="building_classification"> {{ form.building_classification }}
{% for bc in building_classifications %}
<option>{{ bc }}</option>
{% endfor %}
</select>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker"> {{ form.construction_type }}
{% for ct in construction_types %} </div>
<option>{{ ct }}</option> </div>
{% endfor %} </div>
</select>
<div class="slideRes disTab activeSlide">
<div class="titleF1 disTab">
<div class="col-lg-3">Местоположение</div>
</div> </div>
<div class="polsF1 disTab">
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker"> <input type="hidden" class="-location-select -location-select-country" style="width: 100%">
<option>Mustard</option>
</select>
</div> </div>
<div class="col-lg-3"> <div class="col-lg-3">
<select class="selectpicker"> <input type="hidden" class="-location-select -location-select-region" style="width: 100%">
<option>Mustard</option>
</select>
</div> </div>
<div class="col-lg-3">
<input type="hidden" class="-location-select -location-select-city" style="width: 100%">
</div> </div>
<input type="hidden" id="chosenLocationId" name="{{ realty_form.location.html_name }}" value="{{ realty_form.location.value }}">
</div>
</div> </div>
</div> </div>
</div> </div>
</form> </form>
<div class="galleryWork disTab"> <div class="galleryWork disTab">
{% for work in object_list %} {% for work in work_sells %}
<div class="col-lg-3"> <div class="col-lg-3">
<div class="insetCol box-sizing disTab"> <div class="insetCol box-sizing disTab">
<a href="{% url 'work_sell:detail' work.pk %}"> <a href="{% url 'work_sell:detail' work.pk %}">

3
work_sell/urls.py
Unescape View File

@ -11,13 +11,14 @@ from .views import (
BasicCreateView, BasicCreateView,
PictureCreateView, PictureCreateView,
ContractorWorkSellTrashView, ContractorWorkSellTrashView,
WorkSellFilterView,
) )
app_name = 'work_sell' app_name = 'work_sell'
urlpatterns = [ urlpatterns = [
urls.url(r'^$', WorkSellsView.as_view(), name='list'), urls.url(r'^$', WorkSellFilterView.as_view(), name='list'),
# urls.url(r'^create/$', WorkSellCreateView.as_view(), name='create'), # urls.url(r'^create/$', WorkSellCreateView.as_view(), name='create'),
urls.url(r'^upload/$', UploadView.as_view(), name='upload'), urls.url(r'^upload/$', UploadView.as_view(), name='upload'),
urls.url(r'^(?P<pk>\d+)/edit/$',WorkSellUpdateView.as_view(), name='edit'), urls.url(r'^(?P<pk>\d+)/edit/$',WorkSellUpdateView.as_view(), name='edit'),

73
work_sell/views.py
Unescape View File

@ -1,12 +1,16 @@
import json import json
import re
import pydash as _; import pydash as _;
_.map = _.map_; _.map = _.map_;
_.filter = _.filter_ _.filter = _.filter_
from pprint import pprint, pformat from pprint import pprint, pformat
from django.shortcuts import render, redirect from django.shortcuts import render, redirect
from django.conf import settings
from django.contrib import messages from django.contrib import messages
from django.db.models import Q
from django.core.urlresolvers import reverse from django.core.urlresolvers import reverse
from django.core.paginator import Paginator, EmptyPage, PageNotAnInteger
from django.http import JsonResponse, HttpResponse from django.http import JsonResponse, HttpResponse
from django.core.files.base import ContentFile from django.core.files.base import ContentFile
from django.views.generic import ListView, DetailView, CreateView, View, \ from django.views.generic import ListView, DetailView, CreateView, View, \
@ -14,10 +18,10 @@ from django.views.generic import ListView, DetailView, CreateView, View, \
from projects.models import BuildingClassfication, ConstructionType from projects.models import BuildingClassfication, ConstructionType
from .models import WorkSell, Picture, WorkSellPhoto from .models import WorkSell, Picture, WorkSellPhoto
from .forms import WorkSellForm, ContractorWorkSellTrashForm from .forms import WorkSellForm, WorkSellFilterForm, ContractorWorkSellTrashForm
from .serialize import serialize from .serialize import serialize
from .response import JSONResponse, response_mimetype from .response import JSONResponse, response_mimetype
from archilance.mixins import BaseMixin
class PictureCreateView(CreateView): class PictureCreateView(CreateView):
model = Picture model = Picture
@ -63,6 +67,69 @@ class WorkSellsView(ListView):
return context return context
class WorkSellFilterView(BaseMixin,View):
template_name = 'worksells_list.html'
form_class = WorkSellFilterForm
def get(self, request, *args, **kwargs):
form = self.form_class(request.GET, request=request)
context = self.get_context_data(**_.merge({}, request.GET,kwargs))
work_sells = WorkSell.objects
if form.is_valid():
keywords = form.cleaned_data.get('keywords')
specialization = form.cleaned_data.get('specialization')
building_classification = form.cleaned_data.get('building_classification')
construction_type = form.cleaned_data.get('construction_type')
location = form.cleaned_data.get('location')
if keywords:
keywords = tuple(filter(None, re.split(r'\s|,|;', keywords)))
for k in keywords:
work_sells = work_sells.filter(Q(name__icontains=k) | Q(text__icontains=k))
if specialization:
work_sells = work_sells.filter(
specialization__lft__gte=specialization.lft,
specialization__rght__lte=specialization.rght,
)
if building_classification:
work_sells = work_sells.filter(building_classification=building_classification)
if construction_type:
work_sells = work_sells.filter(construction_type=construction_type)
if location:
work_sells = work_sells.filter(
location__lft__gte=location.lft,
location__rght__lte=location.rght,
)
paginator = Paginator(work_sells.all(), settings.PAGE_SIZE)
page = request.GET.get('page')
try:
work_sells = paginator.page(page)
except PageNotAnInteger:
work_sells = paginator.page(1)
except EmptyPage:
work_sells = paginator.page(paginator.num_pages)
context.update({
'form': form,
'work_sells': work_sells,
'is_paginated': True,
'page_obj': work_sells,
})
return render(request, self.template_name, context)
class WorkSellDetail(DetailView): class WorkSellDetail(DetailView):
model = WorkSell model = WorkSell
template_name = 'worksell_detail.html' template_name = 'worksell_detail.html'
@ -78,7 +145,9 @@ def work_sell_create(request):
form = WorkSellForm(data=request.POST) form = WorkSellForm(data=request.POST)
if form.is_valid(): if form.is_valid():
instance = form.save(commit=False) instance = form.save(commit=False)
# import code; code.interact(local=dict(globals(), **locals()))
instance.save() instance.save()
form.save_m2m()
images_ids = request.POST.get('images-ids').split(';')[:-1] images_ids = request.POST.get('images-ids').split(';')[:-1]
for pk in images_ids: for pk in images_ids:
picture = Picture.objects.get(pk=pk) picture = Picture.objects.get(pk=pk)

Write Preview
Loading…
Cancel
Save