From 5e3980754ae31e36f7b7d830e00bb26f230be06e Mon Sep 17 00:00:00 2001
From: Sanasol <mail@sanasol.ws>
Date: Mon, 23 Apr 2018 21:19:32 +0300
Subject: [PATCH 1/2] some fixes

---
 .../blocks/_schedule_purchased_item.html      |  7 +++-
 apps/school/templates/blocks/online.html      |  2 +-
 apps/school/templates/blocks/schedule.html    |  2 +-
 .../templates/blocks/schedule_purchased.html  |  4 +--
 .../templates/school/schedules_print.html     | 34 +++++++++---------
 apps/user/templates/user/profile.html         | 12 +++++--
 project/templates/blocks/header.html          | 11 +++---
 project/templates/blocks/live.html            |  2 +-
 .../templates/blocks/school_schedules.html    |  2 +-
 project/templates/lilcity/edit_index.html     | 36 +++++++++++++------
 web/src/components/CourseRedactor.vue         |  4 +--
 web/src/js/modules/api.js                     |  2 +-
 web/src/js/modules/popup.js                   | 21 +++++++++--
 web/src/js/modules/toggle.js                  |  8 +++--
 web/src/sass/_common.sass                     | 11 +++---
 15 files changed, 104 insertions(+), 54 deletions(-)

diff --git a/apps/school/templates/blocks/_schedule_purchased_item.html b/apps/school/templates/blocks/_schedule_purchased_item.html
index 9f10d576..7348bf12 100644
--- a/apps/school/templates/blocks/_schedule_purchased_item.html
+++ b/apps/school/templates/blocks/_schedule_purchased_item.html
@@ -1,5 +1,5 @@
 {% load static %} {% load thumbnail %}
-<div class="timing__item{% if not live_lesson %} timing__item_bg{% endif %} js-timing-item">
+<div class="timing__item {% if not live_lesson %} timing__item_bg{% endif %} js-timing-item js-timing-toggle">
   <div class="timing__cell">
     {% if school_schedule.is_purchased %}
     <div class="timing__info">
@@ -16,6 +16,11 @@
       {% include './open_lesson.html' %}
       {% endif %}
     </div>
+
+    {% comment %}
+    <!-- это нужно чтобы в попапе продления школы всегда знать какие дни выбраны(куплены) -->
+    {% endcomment %}
+    <span style="display: none;" data-purchased="{{ school_schedule.weekday }}"></span>
     {% else %}
     {% include './pay_btn.html' %}
     {% endif %}
diff --git a/apps/school/templates/blocks/online.html b/apps/school/templates/blocks/online.html
index b8b7dae3..5d964531 100644
--- a/apps/school/templates/blocks/online.html
+++ b/apps/school/templates/blocks/online.html
@@ -1,5 +1,5 @@
 {% load static %}
-<a class="online" href="#" style="background-image: url({% static 'img/video-1.jpg' %});">
+<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0&t=471s" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
     <div class="online__type">ПРЯМОЙ ЭФИР</div>
     <div class="online__title">Каждый день в 17.00 (по Мск) </div>
diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index 2efa91a7..19528349 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -7,7 +7,7 @@
       <div class="timing__week">
         {% for school_schedule in school_schedules %}
         {% with current_live_lesson=school_schedule.current_live_lesson %}
-        <div class="timing__item{% if not current_live_lesson %} timing__item_bg{% endif %} js-timing-item">
+        <div class="timing__item{% if not current_live_lesson %} timing__item_bg{% endif %} js-timing-item js-timing-toggle">
           <div class="timing__cell">
             <div class="timing__info">
               <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
diff --git a/apps/school/templates/blocks/schedule_purchased.html b/apps/school/templates/blocks/schedule_purchased.html
index f1ce1198..2a6ed46b 100644
--- a/apps/school/templates/blocks/schedule_purchased.html
+++ b/apps/school/templates/blocks/schedule_purchased.html
@@ -42,7 +42,7 @@
           </div>
           <div class="timing__foot">
             {% include './pay_btn.html' %}
-            <a class="timing__print" href="#">Распечатать расписание
+            <a target="_blank" class="timing__print" href="{% url 'school:school_schedules-print' %}">Распечатать расписание
               <span class="bold">чтобы не забыть</span>
               <svg class="icon icon-print">
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-print"></use>
@@ -53,5 +53,5 @@
       </div>
     </div>
   </div>
-  {% include './last_courses.html' %}
 </div>
+{% include './last_courses.html' %}
diff --git a/apps/school/templates/school/schedules_print.html b/apps/school/templates/school/schedules_print.html
index bd8485c0..18e3256e 100644
--- a/apps/school/templates/school/schedules_print.html
+++ b/apps/school/templates/school/schedules_print.html
@@ -19,7 +19,7 @@
         <div class="timing js-timing">
           <div class="timing__week">
             {% for school_schedule in school_schedules %} {% with current_live_lesson=school_schedule.current_live_lesson %}
-            <div class="timing__item{% if not current_live_lesson %} timing__item_bg{% endif %} js-timing-item open">
+            <div class="timing__item {% if not current_live_lesson %} timing__item_bg{% endif %} js-timing-item open">
               <div class="timing__cell">
                 <div class="timing__info">
                   <div class="timing__day{% if school_schedule.is_online %} active{% endif %}">
@@ -51,27 +51,27 @@
                 <div class="timing__more">
                   <div class="timing__head">Материалы</div>
                   <div class="timing__row">
-                    <div class="timing__col">
-                      <div class="timing__text">
-                        <p>{{ school_schedule.description }}</p>
-                      </div>
-                    </div>
-                    <div class="timing__col">
+                    <!--<div class="timing__col">-->
+                      <!--<div class="timing__text">-->
+                        <!--<p>{{ school_schedule.description }}</p>-->
+                      <!--</div>-->
+                    <!--</div>-->
+                    <div class="timing__col" style="flex: 0 0 100%;">
                       <div class="timing__text">
                         {{ school_schedule.materials }}
                       </div>
                     </div>
                   </div>
-                  {% if school_schedule.schoolschedule_images.exists %}
-                  <div class="timing__head">Результаты прошлых уроков</div>
-                  <div class="timing__works gallery">
-                    {% for image in school_schedule.schoolschedule_images.all %} {% thumbnail image.img.image "48x48" crop="center" as im %}
-                    <a class="timing__work" href="{{ image.img.image.url }}">
-                      <img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
-                    </a>
-                    {% endthumbnail %} {% endfor %}
-                  </div>
-                  {% endif %}
+                  <!--{% if school_schedule.schoolschedule_images.exists %}-->
+                  <!--<div class="timing__head">Результаты прошлых уроков</div>-->
+                  <!--<div class="timing__works gallery">-->
+                    <!--{% for image in school_schedule.schoolschedule_images.all %} {% thumbnail image.img.image "48x48" crop="center" as im %}-->
+                    <!--<a class="timing__work" href="{{ image.img.image.url }}">-->
+                      <!--<img class="timing__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />-->
+                    <!--</a>-->
+                    <!--{% endthumbnail %} {% endfor %}-->
+                  <!--</div>-->
+                  <!--{% endif %}-->
                 </div>
               </div>
             </div>
diff --git a/apps/user/templates/user/profile.html b/apps/user/templates/user/profile.html
index 8a2371b0..d55411a8 100644
--- a/apps/user/templates/user/profile.html
+++ b/apps/user/templates/user/profile.html
@@ -71,14 +71,17 @@
           <span class="mobile-hide">КУРСЫ</span>
         </button>
         {% endif %}
+        {% comment %}
         <button class="tabs__btn js-tabs-btn">ШКОЛА</button>
-        {% comment %} <button class="tabs__btn js-tabs-btn">
+
+        <button class="tabs__btn js-tabs-btn">
           <span class="mobile-hide">КУРСЫ</span>
           НА МОДЕРАЦИИ
         </button>
         <button class="tabs__btn js-tabs-btn">ЧЕРНОВИК
           <span class="mobile-hide">КУРСА</span>
-        </button> {% endcomment %}
+        </button>
+        {% endcomment %}
       </div>
       <div class="tabs__container">
         <div class="tabs__item js-tabs-item">
@@ -97,6 +100,8 @@
           </div>
         </div>
         {% endif %}
+
+        {% comment %}
         <div class="tabs__item js-tabs-item">
           <div class="courses courses_scroll">
             <div class="courses__list">
@@ -104,7 +109,8 @@
             </div>
           </div>
         </div>
-        {% comment %} <div class="tabs__item js-tabs-item">
+
+        <div class="tabs__item js-tabs-item">
           <div class="courses courses_scroll">
             <div class="courses__list">
               {% include "course/course_items.html" with course_items=pending %}
diff --git a/project/templates/blocks/header.html b/project/templates/blocks/header.html
index 49a595b5..17fbc8da 100644
--- a/project/templates/blocks/header.html
+++ b/project/templates/blocks/header.html
@@ -104,7 +104,10 @@
           {% endif %}
           {% if request.user.role == request.user.TEACHER_ROLE or request.user.role == request.user.ADMIN_ROLE %}
           <a class="header__link header__link_green" href="{% url 'school:lessons-create' %}">
-            <div class="header__title">ДОБАВИТЬ ОНЛАЙН-УРОК</div>
+            <div class="header__title">ДОБАВИТЬ УРОК ШКОЛЫ</div>
+          </a>
+          <a class="header__link" href="{% url 'school:lessons' %}">
+            <div class="header__title">УРОКИ ШКОЛЫ</div>
           </a>
           {% endif %}
           {% endif %}
@@ -112,9 +115,9 @@
           <a class="header__link" href="{% url 'user' request.user.id %}">
             <div class="header__title">ПРОФИЛЬ</div>
           </a>
-          <a class="header__link" href="#">
-            <div class="header__title">НАСТРОЙКИ</div>
-          </a>
+          <!--<a class="header__link" href="#">-->
+            <!--<div class="header__title">НАСТРОЙКИ</div>-->
+          <!--</a>-->
           <a class="header__link" href="{% url 'lilcity:logout' %}">
             <div class="header__title">ВЫЙТИ</div>
           </a>
diff --git a/project/templates/blocks/live.html b/project/templates/blocks/live.html
index b8b7dae3..5d964531 100644
--- a/project/templates/blocks/live.html
+++ b/project/templates/blocks/live.html
@@ -1,5 +1,5 @@
 {% load static %}
-<a class="online" href="#" style="background-image: url({% static 'img/video-1.jpg' %});">
+<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0&t=471s" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
     <div class="online__type">ПРЯМОЙ ЭФИР</div>
     <div class="online__title">Каждый день в 17.00 (по Мск) </div>
diff --git a/project/templates/blocks/school_schedules.html b/project/templates/blocks/school_schedules.html
index 09d42ead..2ea5739b 100644
--- a/project/templates/blocks/school_schedules.html
+++ b/project/templates/blocks/school_schedules.html
@@ -24,6 +24,6 @@
       {% endfor %}
     </div>
     <div class="text text_mb0">
-      <a target="_blank" href="{% url 'school_schedules' %}">Распечатать расписание</a> чтобы не забыть</div>
+      <a  target="_blank" href="{% url 'school:school_schedules-print' %}">Распечатать расписание</a> чтобы не забыть</div>
   </div>
 </div>
diff --git a/project/templates/lilcity/edit_index.html b/project/templates/lilcity/edit_index.html
index c1804af1..3b02591f 100644
--- a/project/templates/lilcity/edit_index.html
+++ b/project/templates/lilcity/edit_index.html
@@ -1,4 +1,5 @@
 {% load static %}
+{% load thumbnail %}
 {% load active_link_tags %}
 
 {% load category_menu_items from lilcity_category %}
@@ -56,27 +57,40 @@
         </div>
         {% if request.user.is_authenticated %}
         <div class="header__login">
-          {% if request.user.photo %}
-          <div class="header__ava ava"><img class="ava__pic" src="{{ request.user.photo.url }}"></div>
-          {% else %}
-          <div class="header__ava ava"><img class="ava__pic" src="{% static 'img/user.jpg' %}"></div>
-          {% endif %}
+          <div class="header__ava ava">
+            {% thumbnail request.user.photo "48x48" crop="center" as im %}
+            <img class="ava__pic" src="{{ im.url }}" width="{{ im.width }}" height="{{ im.height }}" />
+            {% empty %}
+            <img class="ava__pic" src="{% static 'img/no_cover.png' %}" width="48px" height="48px" />
+            {% endthumbnail %}
+          </div>
           <div class="header__drop">
-            {% comment %} <a class="header__link header__link_border" href="#">234.120.345 руб.</a> {% endcomment %}
-            {% if request.user.auth_token %}
             {% if request.user.role >= request.user.AUTHOR_ROLE %}
+            <a class="header__link header__link_border" href="{% url 'user-edit-payments' request.user.id %}">
+              {{ request.user.balance }} руб.
+            </a>
+            {% if request.user.auth_token %}
+            {% if request.user.role == request.user.AUTHOR_ROLE or request.user.role == request.user.ADMIN_ROLE %}
             <a class="header__link header__link_green" href="{% url 'course_create' %}">
-            {% comment %} <a class="header__link header__link_gray disabled" href="#"> {% endcomment %}
               <div class="header__title">ДОБАВИТЬ КУРС</div>
             </a>
             {% endif %}
+            {% if request.user.role == request.user.TEACHER_ROLE or request.user.role == request.user.ADMIN_ROLE %}
+            <a class="header__link header__link_green" href="{% url 'school:lessons-create' %}">
+              <div class="header__title">ДОБАВИТЬ УРОК ШКОЛЫ</div>
+            </a>
+            <a class="header__link" href="{% url 'school:lessons' %}">
+              <div class="header__title">УРОКИ ШКОЛЫ</div>
+            </a>
+            {% endif %}
+            {% endif %}
             {% endif %}
             <a class="header__link" href="{% url 'user' request.user.id %}">
               <div class="header__title">ПРОФИЛЬ</div>
             </a>
-            <a class="header__link" href="#">
-              <div class="header__title">НАСТРОЙКИ</div>
-            </a>
+            <!--<a class="header__link" href="#">-->
+            <!--<div class="header__title">НАСТРОЙКИ</div>-->
+            <!--</a>-->
             <a class="header__link" href="{% url 'lilcity:logout' %}">
               <div class="header__title">ВЫЙТИ</div>
             </a>
diff --git a/web/src/components/CourseRedactor.vue b/web/src/components/CourseRedactor.vue
index d5cc5c5d..5c9106fc 100644
--- a/web/src/components/CourseRedactor.vue
+++ b/web/src/components/CourseRedactor.vue
@@ -607,7 +607,7 @@
                         this.course = api.convertCourseJson(response.data);
                         this.course.live = this.live;
 
-                        if (this.course.date) {
+                        if (this.live && this.course.date) {
                             this.course.date = _.find(this.scheduleOptions, (item) => {
                                 return item.value == this.course.date;
                             })
@@ -749,7 +749,7 @@
                                 this.course.id = courseData.id;
                             }
 
-                            if(courseData.date) {
+                            if(this.live && courseData.date) {
                                 this.course.date = _.find(this.scheduleOptions, function(item){
                                     return item.value == courseData.date;
                                 });
diff --git a/web/src/js/modules/api.js b/web/src/js/modules/api.js
index 2f71631d..a6fcb5f2 100644
--- a/web/src/js/modules/api.js
+++ b/web/src/js/modules/api.js
@@ -64,7 +64,7 @@ export const api = {
         if (courseObject.is_deferred) {
             if (courseObject.date && courseObject.time && courseObject.time.value) {
                 let deferredStartTime = moment(courseObject.time.value, "HH:mm");
-                let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour());
+                let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour()).minute(deferredStartTime.minute());
                 deferredStart = deferredStartDate.format();
             }
         }
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index ae78ae6b..b8471147 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -1,5 +1,6 @@
 import $ from 'jquery';
 
+var selectedWeekdays = {};
 $(document).ready(function () {
     let body = $('body'),
         popup;
@@ -12,10 +13,26 @@ $(document).ready(function () {
         popup = $(data);
         showPopup();
 
+        if(data === '.js-popup-buy') {
+            console.log('reset selected');
+            $('[data-day]').prop('checked', false);
+
+            if ($(this).text() === 'продлить') {
+                //data-purchased
+                //restore purchased selection
+                console.log('restore purchased');
+                $('[data-purchased]').each(function(){
+                    $('[data-day='+$(this).data('purchased')+']').prop('checked', true);
+                });
+            }
+        }
+
         if($(this).data('day')) {
             let day = $(this).data('day');
             $('[data-day='+day+']').prop('checked', true);
         }
+
+        $('[data-day]').trigger('change');
     });
 
     $('.js-popup-close').on('click', function(e){
@@ -57,8 +74,8 @@ $(document).ready(function () {
         }
     }
 
-    var selectedWeekdays = {};
     $(document).on('change', '[data-day]', function(){
+        console.log('on change data-day');
         var weekday = $(this).data('day');
         var price = $(this).data('price');
         if($(this).is(':checked')) {
@@ -74,7 +91,7 @@ $(document).ready(function () {
 
     function updateCart(){
         var days = ['', 'Понедельник', 'Вторник', 'Среда', 'Четверг', 'Пятница', 'Суббота', 'Воскресенье'];
-        var weekdays = [], daysText = [], price = 0, discount = 0;
+        var weekdays = [], daysText = [], price = 0;
         for(var i in selectedWeekdays) {
             price += parseInt(selectedWeekdays[i].price);
             weekdays.push(i);
diff --git a/web/src/js/modules/toggle.js b/web/src/js/modules/toggle.js
index 309a65c0..c9be6ddf 100644
--- a/web/src/js/modules/toggle.js
+++ b/web/src/js/modules/toggle.js
@@ -10,8 +10,10 @@ $(document).ready(function () {
     $('.js-timing-toggle').on('click', function(e){
         e.preventDefault();
         let _this = $(this);
-        let _parent = _this.closest('.timing__item')
-        _parent.toggleClass('open');
-        // _parent.next().slideToggle();
+        if(!$(e.target).data('popup')) {
+            let _parent = _this.closest('.timing__item')
+            _parent.toggleClass('open');
+            // _parent.next().slideToggle();
+        }
     });
 });
diff --git a/web/src/sass/_common.sass b/web/src/sass/_common.sass
index d3cfb795..9b6230ca 100755
--- a/web/src/sass/_common.sass
+++ b/web/src/sass/_common.sass
@@ -2440,10 +2440,10 @@ a.grey-link
     display: flex
     align-items: center
   &__item
-    &:not(:last-child)
-      margin-right: 40px
-      +t
-        margin-right: 30px
+    //&:not(:last-child)
+    margin-right: 40px
+    +t
+      margin-right: 30px
   &__icon
     margin-right: 10px
     font-size: 0
@@ -2974,6 +2974,7 @@ a.grey-link
     height: 120px
     margin-right: 25px
     flex: 0 0 120px
+    margin: 15px auto
     +m
       width: 140px
       height: 140px
@@ -3657,6 +3658,8 @@ a.grey-link
     display: flex
     position: relative
     padding: 20px 0
+    cursor: pointer
+    page-break-inside: avoid
     +nf
       border-top: 1px solid $border
     &_bg

From d36fe6b0a85ae88b5e8c225795547204312afb23 Mon Sep 17 00:00:00 2001
From: Sanasol <mail@sanasol.ws>
Date: Mon, 23 Apr 2018 22:06:13 +0300
Subject: [PATCH 2/2] yt timing remove

---
 apps/school/templates/blocks/online.html | 2 +-
 project/templates/blocks/live.html       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/apps/school/templates/blocks/online.html b/apps/school/templates/blocks/online.html
index 5d964531..1da3e731 100644
--- a/apps/school/templates/blocks/online.html
+++ b/apps/school/templates/blocks/online.html
@@ -1,5 +1,5 @@
 {% load static %}
-<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0&t=471s" style="background-image: url({% static 'img/video-1.jpg' %});">
+<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
     <div class="online__type">ПРЯМОЙ ЭФИР</div>
     <div class="online__title">Каждый день в 17.00 (по Мск) </div>
diff --git a/project/templates/blocks/live.html b/project/templates/blocks/live.html
index 5d964531..1da3e731 100644
--- a/project/templates/blocks/live.html
+++ b/project/templates/blocks/live.html
@@ -1,5 +1,5 @@
 {% load static %}
-<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0&t=471s" style="background-image: url({% static 'img/video-1.jpg' %});">
+<a class="online" target="_blank" href="https://www.youtube.com/watch?v=PhZ8qQbIej0" style="background-image: url({% static 'img/video-1.jpg' %});">
   <div class="online__center center">
     <div class="online__type">ПРЯМОЙ ЭФИР</div>
     <div class="online__title">Каждый день в 17.00 (по Мск) </div>