Merge branch 'PR-36'

templates/partials/header.html

@@ -119,12 +119,6 @@
                             {% contractor_indicator request.user %}
                         {% endif %}
 
-
-
-                        {% if request.user.is_contractor %}
-
-                        {% endif %}
-
                     {% else %}
                         <a href="{% url 'registration_register' %}" class="reg">Регистрация</a>
                         <a href="{% url 'auth_login' %}">

templates/partials/sass/header.sass

@@ -169,14 +169,17 @@ header
         position: relative
         cursor: pointer
         margin-left: 10px
-
-      .ratingInset
+      .ratingInset-wrapper
+        position: relative
         width: 46px
         height: 46px
+      .ratingInset
+        width: 100%
+        height: 100%
         border-radius: 100%
         background-color: #FF0027
         display: inline-block
-        /* position: absolute; */
+        position: absolute
         /* left: -1.859px; */
         /* bottom: 3px; */
         clip: rect(0, 22px, 50px, 0)

users/templates/contractor_profile.html

@@ -803,7 +803,6 @@
                     data: dataSerializer,
                     dataType: 'json',
                     success: function (data) {
-                        consoCoole.log(data);
                         if (data.status == 'ok') {
                             $("#resume-text-out").html(data.text);
                             $("#resume-text-edit").modal('hide');

users/templates/templatetags/contractor_indicator.html

@@ -1,5 +1,7 @@
 <div class="rating">
-    <div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div>
+    <div class="ratingInset-wrapper">
+        <div class="ratingInset" style="clip:rect(0px, {{ current_indicator_px }}px, 50px, 0px);"></div>
+    </div>
     <div class="iconRating"></div>
     <p class="ratingPer">{{ current_indicator }}%</p>
 </div>

users/templatetags/user_tags.py

@@ -15,16 +15,27 @@ register = template.Library()
 
 @register.inclusion_tag('templatetags/contractor_indicator.html', takes_context=True)
 def contractor_indicator(context, contractor):
-    fields = ['avatar', 'cro', 'first_name', 'gender',
+    fields = ['avatar', 'first_name', 'gender',
               'last_name', 'patronym', 'phone',
-              'skype', 'website', 'location']
+              'skype', 'website', 'location',
+              'contractor_specializations', 'contractor_building_classifications', 'contractor_construction_types',
+              'contractor_resume__text']
 
     indicator_sum = 0
     for f in fields:
         if hasattr(contractor, f) and getattr(contractor, f):
+            try:
+                if not getattr(contractor, f).all():
+                    continue
+            except AttributeError:
+                pass
             indicator_sum += 1
 
-    current_indicator = math.ceil(math.ceil(100 / len(fields)) * indicator_sum)
+    # Если в резюме > 100 символов - считаем его заполненным
+    if len(getattr(contractor, 'contractor_resume').text) > 100:
+        indicator_sum += 1
+
+    current_indicator = math.ceil(math.ceil(100 / len(fields) * indicator_sum))
     current_indicator_px = math.ceil(current_indicator / 2)
     return {
         'current_indicator': current_indicator,