Merge branch 'hotfix/lil-603' into 'master'

Hotfix/lil 603

See merge request lilcity/backend!81

apps/school/views.py

@@ -181,7 +181,8 @@ class SummerSchoolView(TemplateView):
         is_previous = 'is_previous' in self.request.GET
         date_now = now().date()
         yesterday = date_now - timedelta(days=1)
-        month_start = date_now.replace(day=1)
+        # month_start = date_now.replace(day=1)
+        month_start = datetime(2018, 7, 1).date()
         now_time = now()
         try:
             school_schedule = SchoolSchedule.objects.get(weekday=now_time.isoweekday())
@@ -211,7 +212,7 @@ class SummerSchoolView(TemplateView):
             ).annotate(
                 joined_weekdays=Func(F('weekdays'), function='unnest',)
             ).distinct().values_list('joined_weekdays', flat=True)
-            all_schedules_purchased = map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased)
+            all_schedules_purchased = list(map(lambda x: 1 if x == 7 else x+1, all_schedules_purchased))
 
             school_payment = SchoolPayment.objects.filter(
                 user=self.request.user,

apps/user/templates/user/profile.html

@@ -67,8 +67,8 @@
     <div class="tabs js-tabs">
       <div class="tabs__nav">
         {% if owner %}
-        <button class="tabs__btn js-tabs-btn active">ЛАГЕРЬ</button>
+        {# <button class="tabs__btn js-tabs-btn active">ЛАГЕРЬ</button> #}
-        <button class="tabs__btn js-tabs-btn">ПРИОБРЕТЕННЫЕ
+        <button class="tabs__btn js-tabs-btn active">ПРИОБРЕТЕННЫЕ
           <span class="mobile-hide">КУРСЫ</span>
         </button>
         {% endif %}
@@ -78,6 +78,7 @@
       </div>
       <div class="tabs__container">
         {% if owner %}
+        {% comment %}
         <div class="tabs__item js-tabs-item" style="display: block;">
           {% if is_purchased_future %}
             <div class="center center_xs">
@@ -108,7 +109,8 @@
             {% endif %}
           {% endif %}
         </div>
-        <div class="tabs__item js-tabs-item">
+        {% endcomment %}
+        <div class="tabs__item js-tabs-item" style="display: block;">
           <div class="courses courses_scroll">
             <div class="courses__list">
               {% if paid.exists %}