Merge branch 'hotfix/LIL-725' into 'master'

LIL-725 При редактировании курса не подставляется категория

Closes LIL-725

See merge request lilcity/backend!236

web/src/components/CourseRedactor.vue

@@ -18,7 +18,7 @@
                 </a>
               </div>
               <div class="courses__details">
-                <div class="courses__theme theme field info__field--light" v-if="!live" v-bind:class="{ error: (!$v.live && $v.course.category.$dirty || showErrors) && $v.course.category.$invalid }">
+                <div class="field-category courses__theme theme field info__field--light" v-if="!live" v-bind:class="{ error: (!$v.live && $v.course.category.$dirty || showErrors) && $v.course.category.$invalid }">
                   <lil-select :value.sync="course.category" :options="categoryOptions"
                                 placeholder="Выберите категорию"/>
                 </div>
@@ -40,7 +40,7 @@
           </div>
           <div class="info__sidebar">
             <div class="info__wrap">
-              <div class="info__fieldset">
+              <div class="info__fieldset" style="margin-bottom: 20px;">
                 <div v-if="!live" class="info__field field">
                   <div class="field__label field__label_gray">ССЫЛКА</div>
                   <div class="field__wrap">
@@ -122,16 +122,18 @@
                     </label>
                   </div>
                 </div>
-                <div class="info__field field" v-show="course.is_deferred">
-                  <div class="field__label">ДАТА</div>
-                  <div class="field__wrap">
-                    <vue-datepicker :disabled="disabledDates" input-class="field__input" v-model="course.date" language="ru" format="dd/MM/yyyy"/>
+                <div class="datetime-fields" v-show="course.is_deferred">
+                  <div class="info__field field">
+                    <div class="field__label">ДАТА</div>
+                    <div class="field__wrap">
+                      <vue-datepicker :disabled="disabledDates" input-class="field__input" v-model="course.date" language="ru" format="dd/MM/yyyy"/>
+                    </div>
                   </div>
-                </div>
-                <div class="info__field field" v-show="course.is_deferred">
-                  <div class="field__label">ВРЕМЯ</div>
-                  <div class="field__wrap">
-                    <lil-select :value.sync="course.time" :options="timeOptions" placeholder="Выберите время"/>
+                  <div class="field-time info__field field">
+                    <div class="field__label">ВРЕМЯ</div>
+                    <div class="field__wrap">
+                      <lil-select :value.sync="course.time" value-key="value" :options="timeOptions" placeholder="Выберите время"/>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -1225,10 +1227,19 @@
     bottom: 3px;
   }
 
-  .select__head {
+  .field-category .select__head {
     font-size: inherit;
     line-height: inherit;
     height: auto;
   }
+
+  .datetime-fields {
+    display: flex;
+  }
+
+  .field-time {
+    margin-left: 10px;
+    flex: 50%;
+  }
 </style>
 

web/src/js/modules/api.js

@@ -94,8 +94,8 @@ export const api = {
 
         let deferredStart = null;
         if (courseObject.is_deferred) {
-            if (courseObject.date && courseObject.time && courseObject.time.value) {
-                let deferredStartTime = moment(courseObject.time.value, "HH:mm");
+            if (courseObject.date && courseObject.time){
+                let deferredStartTime = moment(courseObject.time, "HH:mm");
                 let deferredStartDate = moment(courseObject.date).hour(deferredStartTime.hour()).minute(deferredStartTime.minute());
                 deferredStart = deferredStartDate.format();
             }
@@ -169,16 +169,17 @@ export const api = {
     },
     convertCourseJson: (courseJSON) => {
         let isDeferred = false;
-        let deferredDate = false;
-        let deferredTime = '';
+        let deferredDate = null;
+        let deferredTime = null;
         if (courseJSON.deferred_start_at) {
-            let deferredDateTime = moment(courseJSON.deferred_start_at);
+            let deferredDateTime = moment.utc(courseJSON.deferred_start_at).local();
             isDeferred = true;
             deferredDate = deferredDateTime.format('MM-DD-YYYY');
             deferredTime = deferredDateTime.format('HH:mm');
         }
         return {
             id: courseJSON.id,
+            age: courseJSON.age,
             title: courseJSON.title,
             status: courseJSON.status,
             short_description: courseJSON.short_description,
@@ -188,7 +189,7 @@ export const api = {
             is_paid: parseFloat(courseJSON.price) > 0,
             is_deferred: isDeferred,
             date: deferredDate || courseJSON.date,
-            time: deferredTime ? {title: deferredTime, value: deferredTime} : null,
+            time: deferredTime,
             duration: courseJSON.duration,
             is_featured: courseJSON.is_featured,
             url: courseJSON.slug,

web/src/sass/_common.sass

@@ -3534,8 +3534,8 @@ a.grey-link
     flex-grow: 1
   &__wrap
     max-width: 349px
-    height: 550px
-    padding: 30px 40px 30px 30px
+    height: 600px
+    padding: 10px 40px 30px 30px
     +t
       max-width: 100%
       height: auto