Merge branch 'dev' of gitlab.com:lilcity/backend into dev

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>

web/src/components/CourseRedactor.vue

@@ -837,7 +837,7 @@
 
                 schedule.then((response) => {
                         if (response.data) {
-                            this.scheduleOptions = response.data.results.map((schedule) => {
+                            this.scheduleOptions = _.orderBy(response.data.results.map((schedule) => {
                                 var now = new Date();
                                 now.setDate(now.getDate() + (schedule.weekday + (7 - now.getDay())) % 7);
 
@@ -845,7 +845,7 @@
                                     title: `${schedule.title} (${this.weekdays[schedule.weekday]}, ${moment(now).format("D MMM")})`,
                                     value: moment(now).format('YYYY-MM-DD')
                                 }
-                            });
+                            }), (item)=>{return moment(item.value)});
                         }
                         this.updateCategory();
                     });

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>

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>

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>

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>

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];
         }
 

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();
         }