From 132e1e556cf67427d1fa4d59c7b25b30be883bfe Mon Sep 17 00:00:00 2001
From: Sanasol <mail@sanasol.ws>
Date: Thu, 26 Apr 2018 11:58:25 +0300
Subject: [PATCH] maxim fixes

---
 apps/school/templates/blocks/schedule.html   |  2 +-
 web/src/components/blocks/BlockImage.vue     |  5 +++++
 web/src/components/blocks/BlockImageText.vue |  5 +++++
 web/src/components/blocks/BlockImages.vue    |  5 +++++
 web/src/components/blocks/BlockVideo.vue     |  5 +++++
 web/src/js/modules/popup.js                  | 14 ++++++++++++--
 web/src/js/modules/toggle.js                 |  3 ++-
 7 files changed, 35 insertions(+), 4 deletions(-)

diff --git a/apps/school/templates/blocks/schedule.html b/apps/school/templates/blocks/schedule.html
index bfd4bebe..62f254f8 100644
--- a/apps/school/templates/blocks/schedule.html
+++ b/apps/school/templates/blocks/schedule.html
@@ -68,7 +68,7 @@
             </div>
           </div>
           <div class="timing__cell">
-            <button class="timing__toggle js-timing-toggle">
+            <button class="timing__toggle">
               <svg class="icon icon-arrow-down">
                 <use xlink:href="{% static 'img/sprite.svg' %}#icon-arrow-down"></use>
               </svg>
diff --git a/web/src/components/blocks/BlockImage.vue b/web/src/components/blocks/BlockImage.vue
index 1de07468..2f95d1b5 100644
--- a/web/src/components/blocks/BlockImage.vue
+++ b/web/src/components/blocks/BlockImage.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="kit__section kit__section--block">
     <div class="kit__section-remove">
+      <button class="sortable__handle" type="button">
+        <svg class="icon icon-hamburger">
+          <use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
+        </svg>
+      </button>
       <button type="button" @click="onRemove">
         <svg class="icon icon-delete">
           <use xlink:href="/static/img/sprite.svg#icon-delete"></use>
diff --git a/web/src/components/blocks/BlockImageText.vue b/web/src/components/blocks/BlockImageText.vue
index 82d70194..2946c36b 100644
--- a/web/src/components/blocks/BlockImageText.vue
+++ b/web/src/components/blocks/BlockImageText.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="kit__section kit__section--block">
     <div class="kit__section-remove">
+      <button class="sortable__handle" type="button">
+        <svg class="icon icon-hamburger">
+          <use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
+        </svg>
+      </button>
       <button type="button" @click="onRemove">
         <svg class="icon icon-delete">
           <use xlink:href="/static/img/sprite.svg#icon-delete"></use>
diff --git a/web/src/components/blocks/BlockImages.vue b/web/src/components/blocks/BlockImages.vue
index 9b561191..e73b3db2 100644
--- a/web/src/components/blocks/BlockImages.vue
+++ b/web/src/components/blocks/BlockImages.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="kit__section kit__section--block">
     <div v-if="!readOnly" class="kit__section-remove">
+      <button class="sortable__handle" type="button">
+        <svg class="icon icon-hamburger">
+          <use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
+        </svg>
+      </button>
       <button type="button" @click="onRemove">
         <svg class="icon icon-delete">
           <use xlink:href="/static/img/sprite.svg#icon-delete"></use>
diff --git a/web/src/components/blocks/BlockVideo.vue b/web/src/components/blocks/BlockVideo.vue
index 382d5536..da0a8587 100644
--- a/web/src/components/blocks/BlockVideo.vue
+++ b/web/src/components/blocks/BlockVideo.vue
@@ -1,6 +1,11 @@
 <template>
   <div class="kit__section kit__section--block">
     <div class="kit__section-remove">
+      <button class="sortable__handle" type="button">
+        <svg class="icon icon-hamburger">
+          <use xlink:href="/static/img/sprite.svg#icon-hamburger"></use>
+        </svg>
+      </button>
       <button type="button" @click="onRemove">
         <svg class="icon icon-delete">
           <use xlink:href="/static/img/sprite.svg#icon-delete"></use>
diff --git a/web/src/js/modules/popup.js b/web/src/js/modules/popup.js
index b8471147..f4bb5e94 100644
--- a/web/src/js/modules/popup.js
+++ b/web/src/js/modules/popup.js
@@ -13,6 +13,8 @@ $(document).ready(function () {
         popup = $(data);
         showPopup();
 
+        let is_extend = false;
+
         if(data === '.js-popup-buy') {
             console.log('reset selected');
             $('[data-day]').prop('checked', false);
@@ -24,6 +26,7 @@ $(document).ready(function () {
                 $('[data-purchased]').each(function(){
                     $('[data-day='+$(this).data('purchased')+']').prop('checked', true);
                 });
+                is_extend = true;
             }
         }
 
@@ -32,6 +35,13 @@ $(document).ready(function () {
             $('[data-day='+day+']').prop('checked', true);
         }
 
+        if(!is_extend && !$(this).data('day')) {
+            console.log('check all');
+            $('[data-day]').each(function(){
+                $(this).prop('checked', true);
+            });
+        }
+
         $('[data-day]').trigger('change');
     });
 
@@ -79,10 +89,10 @@ $(document).ready(function () {
         var weekday = $(this).data('day');
         var price = $(this).data('price');
         if($(this).is(':checked')) {
-            console.log('checked');
+            // console.log('checked');
             selectedWeekdays[weekday] = {price:price};
         } else {
-            console.log('not checked');
+            // console.log('not checked');
             delete selectedWeekdays[weekday];
         }
 
diff --git a/web/src/js/modules/toggle.js b/web/src/js/modules/toggle.js
index c9be6ddf..bc89f91c 100644
--- a/web/src/js/modules/toggle.js
+++ b/web/src/js/modules/toggle.js
@@ -11,7 +11,8 @@ $(document).ready(function () {
         e.preventDefault();
         let _this = $(this);
         if(!$(e.target).data('popup')) {
-            let _parent = _this.closest('.timing__item')
+            let _parent = _this.closest('.timing__item');
+            $(document).find('.timing__item').not(_parent).removeClass('open');
             _parent.toggleClass('open');
             // _parent.next().slideToggle();
         }