#ARC-7 Add score detail view for users

archilance/settings/base.py

@@ -111,7 +111,7 @@ WSGI_APPLICATION = 'archilance.wsgi.application'
 DATABASES = {
     'default': {
         'ENGINE': 'django.db.backends.postgresql_psycopg2',
-        'NAME': 'archilance2',
+        'NAME': 'archilance',
         'USER': 'postgres',
         'PASSWORD': 'postgres',
         'HOST': 'localhost',

archilance/urls.py

@@ -15,6 +15,7 @@ urlpatterns = [
     url(r'^work_sell/', include('work_sell.urls')),
     url(r'^test/$', TemplateView.as_view(template_name='test.html'), name='test'),
     url(r'^projects/', include('projects.urls')),
+    url(r'^wallets/', include('wallets.urls')),
     url(r'^chat/', include('chat.urls')),
     url(r'^specializations/', include('specializations.urls')),
     url(r'^users/', include('users.urls')),

chat/testapp.py

@@ -92,7 +92,7 @@ if __name__ == '__main__':
     ioloop = IOLoop.instance()
 
     application.db = momoko.Pool(
-        dsn='dbname=archilance2 user=postgres password=postgres host=localhost',
+        dsn='dbname=archilance user=postgres password=postgres host=localhost',
         size=1,
         ioloop=ioloop,
     )

ratings/management/commands/recalculation_spec.py

@@ -15,21 +15,29 @@ class Command(BaseCommand):
             result_list.append([user['rating'], 'user', user['pk']])
 
         for team in teams:
-            result_list.append([team['rating'], 'team',team['pk'] ])
+            result_list.append([team['rating'], 'team', team['pk'] ])
 
-        print(sorted(result_list))
-        # SpecializationRating.objects.all().delete()
-        # contractors = User.contractor_objects.order_by('-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')
+        result_list = list(reversed(sorted(result_list)))
+        SpecializationRating.objects.all().delete()
+        specializations = Specialization.objects.all()
+        for spec in specializations:
+            i = 0
+            for res in result_list:
+                if 'user' in res[1]:
+                    user = User.objects.get(pk=res[2])
+                    team = None
+                    specializations_current = user.contractor_specializations.all()
+                else:
+                    team = Team.objects.get(pk=res[2])
+                    user = None
+                    specializations_current = team.specializations.all()
+
+                if spec in specializations_current:
+                    i += 1
+                    spec_rating = SpecializationRating()
+                    spec_rating.position = i
+                    spec_rating.user = user
+                    spec_rating.team = team
+                    spec_rating.specialization = spec
+                    spec_rating.save()
+        print('The end')

ratings/templatetags/specializtions_tags.py

@@ -15,9 +15,10 @@ def specialization_widget(context, user_id):
         'user_id': user_id,
     }
 
+@register.inclusion_tag('templatetags/specializations_widget.html', takes_context=True)
 def specialization_team_widget(context, team_id):
     team_id = int(team_id)
-    specializations = []
+    specializations = SpecializationRating.objects.select_related('specialization').filter(team_id=team_id)
     return {
         'specializations': specializations,
     }

templates/partials/header.html

@@ -100,28 +100,16 @@
                                     </a>
                                 </li>
                                 <li class="icon_mm3">
-                                    <a href="#">
-                                        Сообщения
-                                        <span></span>
-                                    </a>
+                                    <a href="#">Сообщения<span></span></a>
                                 </li>
                                 <li class="icon_mm4">
-                                    <a href="#">
-                                        Счет
-                                        <span></span>
-                                    </a>
+                                    <a href="{% url 'wallets:score-detail' pk=request.user.pk %}">Счет<span></span></a>
                                 </li>
                                 <li class="icon_mm5">
-                                    <a href="#">
-                                        Настройки
-                                        <span></span>
-                                    </a>
+                                    <a href="#">Настройки<span></span></a>
                                 </li>
                                 <li class="icon_mm6">
-                                    <a href="#">
-                                        FAQ
-                                        <span></span>
-                                    </a>
+                                    <a href="#">FAQ<span></span></a>
                                 </li>
                             </ul>
                         </div>

users/templates/contractor_office.html

@@ -150,7 +150,7 @@
                         </div>
 
                         <div class="col-lg-4">
-                            {% specialization_widget contractor.pk %}
+                            {% specialization_team_widget contractor.team.pk %}
                         </div>
 
                         <div class="col-lg-4">

users/templates/partials/customer_profile_info_block.html

@@ -1,6 +1,4 @@
-{% load projects_tags %}
-
-
+{% load specializtions_tags %}
 <div class="col-lg-12">
     <div class="col-lg-3 divCol3">
         <div class="avatar new-mar">

wallets/templates/score-detail.html

@@ -0,0 +1,65 @@
+{% extends 'partials/base.html' %}
+
+{% load staticfiles %}
+{% load thumbnail %}
+{% block content %}
+
+
+{% include 'partials/header.html' %}
+	<div class="container mainScore">
+		<div class="row">
+			<div class="col-lg-12">
+				<p class="titleScore">Ваш счет</p>
+			</div>
+			<div class="col-lg-12">
+				<div class="scoreButtons disTab">
+					<div class="triangle1"></div>
+					<p>35 000 <i class="fa fa-rub"></i></p>
+					<div class="col-lg-6">
+						<a href="javascript:void(0)" class="linkS linkS1">пополнить</a>
+					</div>
+					<div class="col-lg-6">
+						<a href="javascript:void(0)" class="linkS linkS2">вывести средства</a>
+					</div>
+					<table>
+						<tr>
+							<th>Дата</th>
+							<th>Описание</th>
+							<th>Поступление/Списание</th>
+							<th>Баланс</th>
+						</tr>
+						<tr>
+							<td>23.01.2016</td>
+							<td>
+								Оплата этапа 1 по заказу <b>«Сложный долгий заказ»</b>
+							</td>
+							<td>
+								+35 000
+								<i class="fa fa-rub"></i>
+							</td>
+							<td>
+								53 000
+								<i class="fa fa-rub"></i>
+							</td>
+						</tr>
+						<tr>
+							<td>23.01.2016</td>
+							<td>
+								Оплата этапа 1 по заказу <b>«Сложный долгий заказ»</b>
+							</td>
+							<td>
+								+35 000
+								<i class="fa fa-rub"></i>
+							</td>
+							<td>
+								53 000
+								<i class="fa fa-rub"></i>
+							</td>
+						</tr>
+					</table>
+				</div>
+			</div>
+            {% include 'partials/footer.html' %}
+        </div>
+    </div>
+{% endblock %}

wallets/urls.py

@@ -0,0 +1,9 @@
+from django.conf import urls
+from django.conf.urls import include
+from .views import ScoreDetailView
+
+app_name = 'wallets'
+
+urlpatterns = [
+    urls.url(r'^score/(?P<pk>\d+)/$', ScoreDetailView.as_view(), name='score-detail'),
+]

wallets/views.py

@@ -1,3 +1,9 @@
 from django.shortcuts import render
+from django.views.generic import DetailView
+from users.models import User
+
+
+class ScoreDetailView(DetailView):
+    model = User
+    template_name = 'score-detail.html'
 
-# Create your views here.