Merge branch 'feature/drawing-camp' into 'master'

рисовальный лагерь

See merge request lilschool/site!299

apps/school/templates/blocks/schedule.html

@@ -6,7 +6,11 @@
     <div class="timing js-timing">
       <div class="timing__week">
         {% for school_schedule in school_schedules_sorted %}
+          {% if is_drawing_camp %}
+            {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_camp_lesson purchased=True %}
+          {% else %}
             {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson purchased=True %}
+          {% endif %}
         {% endfor %}
       </div>
       <div class="timing__foot">

apps/school/templates/drawing_camp/schedule_purchased.html

@@ -37,11 +37,7 @@
           <div class="timing__week">
             <div class="subtitle2">Новые уроки</div>
             {% for school_schedule in school_schedules_sorted %}
-              {% if is_drawing_camp %}
               {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_camp_lesson %}
-              {% else %}
-                {% include 'blocks/schedule_item.html' with school_schedule=school_schedule live_lesson=school_schedule.current_live_lesson %}
-              {% endif %}
             {% endfor %}
             {% if prev_live_lessons_exists %}
               <div class="subtitle2">Прошедшие уроки</div>