#ARC-10 Add managements command and template tags for contractor

chat/templates/chat_customer.html

@@ -248,7 +248,6 @@
             $("#order-stages").on('click', "#addStagesForm", function(){
                 $(".new-stages-form").each(function(i,v){
                    console.log($(this).serialize());
-                    alert($(this).serialize());
 
                    $.ajax({
                         url: '/api/stages/',
@@ -273,9 +272,6 @@
             $('#order-stages-tab').on('change', '#countStage', function(){
                 var countStage = parseInt($(this).val());
                 var updateFormStages = $(".update-stages-form");
-
-                alert(updateFormStages.length);
-                alert(typeof updateFormStages.length);
                 var limitCount = countStage + 1;
                 for (var i = 2; i < limitCount; i++) {
                     var stageCopy = $("#stage1").clone().attr("id", "stage" + i).addClass("stages_form");
@@ -457,7 +453,6 @@
         });
 
         var userId = '{{ request.user.pk }}';
-
         var SocketHandler = function () {
             var url = 'ws://127.0.0.1:8888/chat/' + userId + '/';
             var sock = new WebSocket(url);

ratings/__init__.py

@@ -0,0 +1 @@
+default_app_config = 'ratings.apps.RatingsConfig'

ratings/management/commands/recalculation_spec.py

@@ -0,0 +1,23 @@
+from django.core.management import BaseCommand
+from specializations.models import Specialization
+from ratings.models import SpecializationRating
+from users.models import User
+
+
+class Command(BaseCommand):
+    def handle(self, *args, **options):
+        SpecializationRating.objects.all().delete()
+        contractors = User.contractor_objects.order_by('-contractor_rating')
+        specializations = Specialization.objects.all()
+        for spec in specializations:
+            i = 0
+            for contractor in contractors:
+                if spec in contractor.contractor_specializations.all():
+                    i += 1
+                    spec_rating = SpecializationRating()
+                    spec_rating.position = i
+                    spec_rating.user = contractor
+                    spec_rating.specialization = spec
+                    spec_rating.save()
+
+        print('The End')

ratings/models.py

@@ -3,6 +3,7 @@ from django.utils import timezone
 from users.models import User, Team
 from specializations.models import Specialization
 
+
 class HistoryRating(models.Model):
     user = models.ForeignKey(User, related_name='history_ratings', null=True, blank=True)
     team = models.ForeignKey(Team, related_name='history_ratings', null=True, blank=True)
@@ -25,12 +26,10 @@ class SpecializationRating(models.Model):
     position = models.PositiveIntegerField(default=0)
 
     def __str__(self):
-        return self.position
+        return '{0}'.format(self.pk)
 
     class Meta:
         verbose_name = 'Рейтинг специализаций'
         verbose_name_plural = 'Рейтинги специализаций'
 
 
-
-

ratings/templates/templatetags/specializations_widget.html

@@ -0,0 +1,9 @@
+<div class="dashedCol4">
+    <p class="specUser">Специализации:</p>
+    {% for spec in specializations %}
+        <div class="insetSpec">
+            <span>{{ spec.specialization.name }}</span>
+            <span>{{ spec.position }}-й</span>
+        </div>
+    {% endfor %}
+</div>

ratings/templatetags/specializtions_tags.py

@@ -2,18 +2,15 @@ from django import template
 
 from archilance import util
 from users.models import User
-
+from ratings.models import SpecializationRating
 
 register = template.Library()
 
 @register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True)
 def specialization_widget(context, user_id):
+
     user_id = int(user_id)
-    user = util.get_or_none(User, pk=user_id)
-    if user:
-        specializations = user.contractor_specializations.all()
-    else:
-        specializations = None
+    specializations = SpecializationRating.objects.select_related('specialization').filter(user_id=user_id)
     return {
         'specializations': specializations,
         'user_id': user_id,

specializations/templates/templatetags/specializations_widget.html

@@ -1,21 +0,0 @@
-<div class="dashedCol4">
-    <p class="specUser">Специализации:</p>
-    {% for spec in specializations %}
-        <div class="insetSpec">
-            <span>{{ spec }}</span>
-            <span>2-й</span>
-        </div>
-    {% endfor %}
-</div>
-{#					<div class="dashedCol4 dashedCol44 dashedColColor">#}
-{#						<p class="specUser">#}
-{#							Специализации:#}
-{#						</p>#}
-{#						<div class="insetSpec">#}
-{#							<span>Интерьеры</span>#}
-{#						</div>#}
-{#                        #}
-{#						<div class="insetSpec">#}
-{#							<span>Визуализация/3D</span>#}
-{#						</div>#}
-{#					</div>#}

users/templates/contractor_profile.html

@@ -28,18 +28,6 @@
                                     </a>
                                     <span></span>
                                 </li>
-                                <li class="icon_um1">
-                                    <a href="{% url 'users:user-profile-edit' pk=contractor.pk %}">
-                                        редактировать профиль
-                                    </a>
-                                    <span></span>
-                                </li>
-                                <li class="icon_um1">
-                                    <a href="{% url 'users:user-profile-edit' pk=contractor.pk %}">
-                                        редактировать профиль
-                                    </a>
-                                    <span></span>
-                                </li>
                             {% endif %}
                             {% if contractor.pk != user.id %}