Merge branch 'master' of http://code.brln.tv/diffusion/ARCH/archilance into mukhtar

common/views.py

@@ -136,9 +136,9 @@ class CustomRegistrationView(RegistrationView):
     def register(self, form):
         user = super().register(form)
         
-        if form.cleaned_data.get('customer'):
+        if form.cleaned_data.get('user_type') == 'customer':
             group = Group.objects.get(name='Заказчики')
-        elif form.cleaned_data.get('contractor'):
+        elif form.cleaned_data.get('user_type') == 'contractor':
             group = Group.objects.get(name='Исполнители')
         else:
             group = None
@@ -151,3 +151,6 @@ class CustomRegistrationView(RegistrationView):
         user.save()
         
         return user
+
+
+# import code; code.interact(local=dict(globals(), **locals()))

projects/templates/project_detail.html

@@ -518,7 +518,7 @@
             {% elif request.user.is_customer and project in request.user.customer_projects.all %}
                 <div class="exBigBlock disTab">
                     <div class="col-lg-12">
-                        <p class="titleEx">Исполнители</p>
+                        <p id="answers" class="titleEx">Исполнители</p>
                     </div>
                     <div class="col-lg-12 exButton">
                         <div class="btn-group" role="group">
@@ -1079,3 +1079,30 @@
 		</div>
 	</div>
 {% endblock %}
+
+
+{% block js_block %}
+    <script>
+        (function() {
+            // Persistent Bootstrap tabs --------------------------------------
+            
+            var $allTabs = $('a[data-toggle="tab"]')
+            
+            var $tab = $allTabs.filter('[href="' + window.location.hash + '"]').first()
+            
+            if (_.isEmpty($tab))
+                $tab = $allTabs.first()
+            
+            $tab.tab('show')
+            $tab.addClass('active')
+            
+            $allTabs.on('click', function($evt) { // Better handle "shown.bs.tab" event?
+                var $tab = $(this)
+                
+                $allTabs.removeClass('active')
+                $tab.addClass('active')
+                window.location.hash = $tab.attr('href')
+            })
+        }())
+    </script>
+{% endblock %}

projects/views.py

@@ -652,7 +652,9 @@ def add_candidate(request, answer_id, project_id):
     if not candidate:
         Candidate.objects.create(answer=answer, project=project, position=count_answers)
     
-    return redirect('projects:detail', pk=project_id)
+    
+    redirect_to = '%s%s' % (reverse('projects:detail', kwargs={'pk': project_id}), '#answers')
+    return redirect(redirect_to)
 
 
 class CandidateDeleteView(DeleteView):

users/forms.py

@@ -53,6 +53,7 @@ class UserProfileEditForm(forms.ModelForm):
         
         fields = (
             'contractor_specializations',
+            'contractor_status',
             'cro',
             'date_of_birth',
             'first_name',
@@ -67,12 +68,16 @@ class UserProfileEditForm(forms.ModelForm):
         )
         
         widgets = {
-            'date_of_birth': forms.TextInput(attrs={'class': 'datepicker'}), # TODO: Use common format with jQueryUI Datepicker
+            # TODO: Use common format with jQueryUI Datepicker:
+            'date_of_birth': forms.TextInput(attrs={'class': 'datepicker box-sizing surr surr2'}),
         }
     
     def __init__(self, *args, **kwargs):
         self.request = kwargs.pop('request')
         super().__init__(*args, **kwargs)
+        
+        attrs = self.fields['contractor_status'].widget.attrs
+        attrs['class'] = _.join(_.compact((attrs.get('class'), 'box-sizing surr surr2')), ' ')
 
 
 class UserProfileBasicInfoEditForm(forms.ModelForm):

users/templates/customer_profile_open_projects.html

@@ -1,5 +1,7 @@
 {% extends 'partials/base.html' %}
 
+{% load project_tags %}
+ 
  
 {% block content %}
     {% include 'partials/header.html' %}
@@ -29,7 +31,7 @@
                     </div>
                 </div>
                 
-                {% if request.user.is_customer %}
+                {% if request.user == customer %}
                     <div class="col-lg-3 col-lg-offset-1">
                         <p class="addWork add-work-new">
                             <a href="{% url 'projects:customer-project-create' %}">Разместить заказ</a>
@@ -52,9 +54,9 @@
                             </ul>
                             
                             <ul class="color-menu">
-                                <li><a href="#">Новые: {{ proj.answers.count|sub:proj.candidates.count }}</a></li>
-                                <li><a href="#">Кандидаты: {{ proj.candidates.count }}</a></li>
-                                <li><a href="#">Отказал: {{ proj.rejected_answers_count }}</a></li>
+                                <li><a href="{% url 'projects:detail' proj.pk %}#new-answers">Новые: {{ proj|get_new_answers|length }}</a></li>
+                                <li><a href="{% url 'projects:detail' proj.pk %}#candidate-answers">Кандидаты: {{ proj|get_candidate_answers|length }}</a></li>
+                                <li><a href="{% url 'projects:detail' proj.pk %}#rejected-answers">Отказал: {{ proj|get_rejected_answers|length }}</a></li>
                             </ul>
                             
                             <p class="textPro">

users/templates/user_profile_edit.html

@@ -118,16 +118,17 @@
                 <div class="col-lg-12 col12 new-filter">
                     <div class="filter clearfix">
                         <div class="titleF1 disTab">
-                            <div class="col-lg-7">Дата рождения</div>
-                            <div class="col-lg-5">Пол</div>
+                            <div class="col-lg-3">Дата рождения</div>
+                            <div class="col-lg-3">Пол</div>
+                            <div class="col-lg-3">Статус</div>
                         </div>
                         
                         <div class="polsF1 disTab">
-                            <div class="col-lg-7 birth_edit_dat">
+                            <div class="col-lg-3 birth_edit_dat">
                                 {{ form.date_of_birth }}
                             </div>
                             
-                            <div class="col-lg-5 dog-new ed-new">
+                            <div class="col-lg-3 dog-new ed-new">
                                 {% for id, text in form.gender.field.choices %}
                                     <label>
                                         <input
@@ -142,13 +143,17 @@
                                     <p>{{ text }}&nbsp;&nbsp;&nbsp;&nbsp;</p>
                                 {% endfor %}
                             </div>
+                            
+                            <div class="col-lg-3">
+                                {{ form.contractor_status }}
+                            </div>
                         </div>
                         
                         <div class="titleF1 titleF2 disTab">
                             <div class="col-lg-3">Сайт</div>
                             <div class="col-lg-3">Skype</div>
                             <div class="col-lg-3">Телефон</div>
-                            <div class="col-lg-3">Телефон 2</div>
+                            <div class="col-lg-3">Второй телефон</div>
                         </div>
                         
                         <div class="searchF1 polsF1 polsFF polsF3">