#ARC-2 add user registered signal

archilance/settings/dev.py

@@ -2,6 +2,8 @@ from .base import *
 
 AUTH_PASSWORD_VALIDATORS = []
 
+INSTALLED_APPS += ['debug_toolbar',]
+
 try:
     from .local import *
 except ImportError:

projects/templates/contractor_project_detail.html

@@ -69,13 +69,13 @@
 				<div class="col-lg-10 col-lg-offset-1">
 					<ul class="listProjectIn">
 						<li>
-							<span>Местоположение:</span> Россия, Москва
+							<span>Местоположение:</span> {{ project.realty.country }}, {{ project.realty.city }}
 						</li>
 						<li>
-							<span>Классификация здания:</span> Коттедж
+							<span>Классификация здания:</span> {{ project.realty.building_classification }}
 						</li>
 						<li>
-							<span>Вид строительства:</span> Новое
+							<span>Вид строительства:</span> {{ project.realty.type_construction }}
 						</li>
 					</ul>
 				</div>
@@ -91,9 +91,8 @@
 					<div class="polsF1 pols-new disTab">
 						<div class="col-lg-3">
 							<select class="selectpicker">
-								<option>Mustard</option>
+								<option value="{{ user.id }}">Ответ от своего имени</option>
-								<option>Ketchup</option>
+                                <option value="{{ user.team.id }}">{{ user.team.name }}</option>
-								<option>Relish</option>
 							</select>
 						</div>
 					</div>
@@ -149,6 +148,18 @@
                     </div>
                     <div class="col-lg-3"></div>
                 </div>
+
+                <div class="polsF1 disTab">
+                    <div class="col-lg-9">
+                        <div class="textAreaBlock2 text-nn box-sizing disTab">
+                         {% for p in user.portfolio.all %}
+                             <h3>{{ p }}</h3>
+                         {% endfor %}
+                        </div>
+                    </div>
+                    <div class="col-lg-3"></div>
+                </div>
+
                 <div class="polsF1 disTab">
                     <div class="col-lg-3"><input type="submit" value="Создать"/></div>
                 </div>

projects/views.py

@@ -17,7 +17,6 @@ class ProjectsView(ListView):
 
     def get_context_data(self, **kwargs):
         context = super().get_context_data(**kwargs)
-
         return context
 
 
@@ -58,6 +57,8 @@ class ProjectCreateView(PermissionRequiredMixin, View):
     permission_required = ('projects.add_project',)
     form_realty = RealtyForm
     form_project = ProjectForm
+    raise_exception = True
+    permission_denied_message = 'Вы не можете выполнить это действие'
     template_name = 'customer_project_create.html'
 
     def get(self, request, *args, **kwargs):

templates/home.html

@@ -20,9 +20,9 @@
 			<div class="row">
 				<div class="col-lg-6">
 					<div class="changeBlock changeBlock1">
-						<a href="{% url 'registration_register' %}">Я исполнитель</a>
+						<a href="{% url 'registration_register' %}?type=contractor">Я исполнитель</a>
 						<p>
-							Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo.
+							Lorem ipsum dolor sit amet, consectetur adipiscing elit.
                         </p>
 					</div>
 					<div class="square">
@@ -31,9 +31,9 @@
 				</div>
 				<div class="col-lg-6">
 					<div class="changeBlock changeBlock2">
-						<a href="{% url 'registration_register' %}">Я заказчик</a>
+						<a href="{% url 'registration_register' %}?type=customer">Я заказчик</a>
 						<p>
-							Lorem ipsum dolor sit amet, consectetur adipiscing elit. Aenean euismod bibendum laoreet. Proin gravida dolor sit amet lacus accumsan et viverra justo commodo.
+							Lorem ipsum dolor sit amet, consectetur adipiscing elit.
                         </p>
 					</div>
 				</div>

templates/registration/login.html

@@ -20,3 +20,4 @@
 
 			</div>
 {% endblock %}
+a

templates/registration/logout.html

@@ -0,0 +1,7 @@
+{% extends 'partials/base.html' %}
+
+{% block content %}
+        <div class="col-lg-12">
+				<p class="titleScore">Выход</p>
+			</div>
+{% endblock %}

templates/registration/registration_complete.html

@@ -0,0 +1,7 @@
+{% extends 'partials/base.html' %}
+
+{% block content %}
+        <div class="col-lg-12">
+				<p class="titleScore">Регистрация прошла успешно</p>
+			</div>
+{% endblock %}

templates/registration/registration_form.html

@@ -1,23 +1,27 @@
 {% extends 'partials/base.html' %}
-
 {% block content %}
     <div class="col-lg-12">
-				<p class="titleScore">Регистрация</p>
+				<p class="titleScore">Регистрация </p>
 			</div>
 			<div class="form-regestration">
               <form method="post">{% csrf_token %}
+                  {{ form.errors }}
 				<div class="col-lg-12 select-reg polsF1">
-					<select class="selectpicker3">
+                    {% if request.GET.type == 'customer' %}
-						<option>Выберете вашу роль</option>
+                        <input type="hidden" name="group_id" value="Заказчики" />
-						<option>Исполнитель</option>
+                    {% else %}
-						<option>Заказчик</option>
+                        <input type="hidden" name="group_id" value="Исполнители" />
-					</select>
+                    {% endif %}
 				</div>
 				<div class="col-lg-12 select-reg">
 					<input type="text" name="{{ form.email.name }}" class="box-sizing email-reg" placeholder="Электронная почта">
 				</div>
 				<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.password1.name }}" class="box-sizing pass-reg" placeholder="Пароль">
+				</div>
+
+                  <div class="col-lg-12 select-reg">
+					<input type="password" name="{{ form.password2.name }}" class="box-sizing pass-reg" placeholder="Пароль">
 				</div>
 				<div class="col-lg-12 select-reg">
 					<button class="reg-sub">Зарегистрироваться</button>

users/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'users.apps.UsersConfig'

users/apps.py

@@ -3,3 +3,6 @@ from django.apps import AppConfig
 
 class UsersConfig(AppConfig):
     name = 'users'
+
+    def ready(self):
+        import users.signals

users/signals.py

@@ -0,0 +1,14 @@
+from django.dispatch import receiver
+from django.contrib.auth.models import Group
+from registration.signals import user_registered
+
+
+@receiver(user_registered)
+def user_registered_callback(sender, user, request, **kwargs):
+    # import code; code.interact(local=dict(globals(), **locals()))
+    group_name = request.POST['group_id'] or None
+    g = Group.objects.get(name=group_name)
+    g.user_set.add(user)
+
+
+

users/templates/contractor_profile.html

@@ -147,6 +147,7 @@
                                     </div>
                                 </div>
                             {% endfor %}
+
                         </div>
                         
                         <div class="col-lg-9 col-lg-offset-3">
@@ -191,33 +192,6 @@
                                 </div>
                             </div>
 
-                            <div class="col-lg-4">
-                                <div class="insetCol box-sizing disTab">
-                                    <div class="imgGal">
-                                        <div class="imgFigure"></div>
-                                    </div>
-                                    <div class="cenaImg box-sizing">
-                                        <div class="cenaImgInset">
-                                            35 000 <i class="fa fa-rub"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                                <div class="insetCol2 box-sizing disTab">
-                                    <p>
-                                        Визуализация 
-                                        загородного
-                                        дома 1500m2
-                                    </p>
-                                    <div class="buttonsImg" disTab>
-                                        <div class="insetBI insetBI1">
-                                            <i class="fa fa-pencil"></i>
-                                        </div>
-                                        <div class="insetBI insetBI2">
-                                            <i class="fa fa-times"></i>
-                                        </div>
-                                    </div>
-                                </div>
-                            </div>
                         </div>
                         <div class="col-lg-9 col-lg-offset-3">
                             <div class="linkElse">

users/templates/users/login.html

@@ -1,36 +0,0 @@
-{% extends 'partials/base.html' %}
-{% block content %}
-
-	<div class="container container_1200"">
-		<hr>
-	</div>
-
-	<!-- block_registr -->
-	<div class="container container_1200" id="registration">
-		<div class="block_registr">
-			<div class="text-center registr">Вход</div>
-				<form method="post" action="{% url 'django.contrib.auth.views.login' %}">
-                          {% csrf_token %}
-
-						<div class="form-group">
-								<input type="email" name="{{ form.username.name }}" class="col-xs-10 form-control" id="inputEmail" placeholder="Электронная почта">
-                                <p>{{ form.email.errors.as_text }}</p>
-						</div>
-
-						<div class="form-group">
-								<input type="password" name="{{ form.password.name }}" class="col-xs-10 form-control" id="inputPassword" placeholder="Пароль">
-                            <p>{{ form.password1.errors.as_text }}</p>
-						</div>
-
-						<div>
-							<button type="submit" class="btn registr_button">
-								Вход
-							</button>
-						</div>
-
-
-				</form>
-		</div>
-    </div>
-	<!-- block_registr end -->
-{% endblock %}

users/templates/users_list.html

@@ -8,52 +8,14 @@
 				<table class="compTable">
 					<tbody><tr>
 						<th>№</th>
-						<th>Кандидат</th>
+						<th></th>
-						<th>Цена</th>
-						<th>Срок</th>
-						<th>Описание</th>
-						<th>Рейтинги/отзывы</th>
-						<th>Безопасные сделки</th>
-						<th>Решение</th>
 					</tr>
                     {% for user in users %}
 					<tr>
-						<td>1</td>
+						<td>{{ forloop.counter }}</td>
 						<td>
 							{{ user.get_full_name }}
 						</td>
-						<td>35 000 <i class="fa fa-rub"></i></td>
-						<td>
-							3<br> <span>недели</span>
-						</td>
-						<td>
-							<span class="glyphicon glyphicon-info-sign" aria-hidden="true"></span>
-						</td>
-						<td>
-							<ul>
-								<li><span>23 560</span></li>
-								<li>
-									<span>+385</span>
-									0
-									<small> - 0</small>
-								</li>
-								<li>
-									СРО
-								</li>
-							</ul>
-						</td>
-						<td>
-							<span>5</span><br>
-							Готов работать по безопасной сделке
-						</td>
-						<td>
-							<div class="tableButtons disTab">
-								<div class="btnTab btnTab1"></div>
-								<div class="btnTab btnTab2"></div>
-								<div class="btnTab btnTab3"></div>
-								<div class="btnTab btnTab4"></div>
-							</div>
-						</td>
 					</tr>
                     {% endfor %}
 				</tbody></table>