From 4d8a5138f2393c72327b0da2794f28ab89d4b6d2 Mon Sep 17 00:00:00 2001
From: Adrian Hinz <ahinz@voicetelecom.pl>
Date: Thu, 16 May 2019 10:58:43 +0200
Subject: [PATCH] lessons functionality

---
 app/controllers/admin/lessons_controller.rb      | 1 +
 app/models/lesson.rb                             | 4 ----
 app/views/admin/lessons/partials/_form.html.erb  | 2 +-
 app/views/admin/lessons/partials/_index.html.erb | 2 +-
 app/views/admin/weeks/show.html.erb              | 1 +
 config/locales/pl/lessons.yml                    | 1 +
 6 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/app/controllers/admin/lessons_controller.rb b/app/controllers/admin/lessons_controller.rb
index 980ff1a..3e4580f 100644
--- a/app/controllers/admin/lessons_controller.rb
+++ b/app/controllers/admin/lessons_controller.rb
@@ -28,6 +28,7 @@ module Admin
     def create
       @lesson = Lesson.new(admin_lesson_params)
       @week = @lesson.week
+      @lesson.course = @week.course
       params[:week_id] = @week.id
       respond_to do |format|
         if @lesson.save
diff --git a/app/models/lesson.rb b/app/models/lesson.rb
index 277cafd..7d64a23 100644
--- a/app/models/lesson.rb
+++ b/app/models/lesson.rb
@@ -23,12 +23,8 @@ class Lesson < ApplicationRecord
   scope :name_desc, -> { order(name: :desc) }
 
   # == Callbacks ============================================================
-  before_create :b_create
 
   # == Class Methods ========================================================
 
   # == Instance Methods =====================================================
-  def b_create
-    self.course = week.course
-  end
 end
diff --git a/app/views/admin/lessons/partials/_form.html.erb b/app/views/admin/lessons/partials/_form.html.erb
index 52bf4b1..3fa57a5 100644
--- a/app/views/admin/lessons/partials/_form.html.erb
+++ b/app/views/admin/lessons/partials/_form.html.erb
@@ -17,7 +17,7 @@
   <div class="form-row">
     <div class="form-group col-md-6">
       <%= form.label :video %>
-      <%= f.select :video_id, options_for_select(Video.all.map{|s|[s.name, s.id]}) %>
+      <%= form.select :video_id, options_for_select(Video.all.map{|s|[s.name, s.id]}, selected: @lesson.video_id), { include_blank: true }, { class: 'form-control' } %>
     </div>
 
     <div class="form-group col-md-6">
diff --git a/app/views/admin/lessons/partials/_index.html.erb b/app/views/admin/lessons/partials/_index.html.erb
index fdac112..5e422e3 100644
--- a/app/views/admin/lessons/partials/_index.html.erb
+++ b/app/views/admin/lessons/partials/_index.html.erb
@@ -4,7 +4,7 @@
     <div class="card shadow mb-4">
       <div class="card-header py-3 d-flex flex-row align-items-center justify-content-between">
         <h6 class="m-0 font-weight-bold text-primary"><%= t('lesson.list') %></h6>
-        <%= link_to raw('<i class="fa fa-plus"></i> Dodaj Nowy Tydzien'), new_admin_lesson_path(week_id: @week.id), { remote: true, class: 'btn btn-sm btn-primary float-right' } %>
+        <%= link_to raw("<i class=\"fa fa-plus\"></i> #{t('lesson.add_new')}"), new_admin_lesson_path(week_id: @week.id), { remote: true, class: 'btn btn-sm btn-primary float-right' } %>
       </div>
       <div class="card-body">
         <div id="ajax_form"></div>
diff --git a/app/views/admin/weeks/show.html.erb b/app/views/admin/weeks/show.html.erb
index 9a5b723..c49cb49 100644
--- a/app/views/admin/weeks/show.html.erb
+++ b/app/views/admin/weeks/show.html.erb
@@ -1,3 +1,4 @@
 <h1 class="h3 mb-1 text-gray-800"><%= t('course.title_show') %>: <strong><%= @course.name %></strong></h1>
 <h1 class="h3 mb-1 text-gray-800"><%= t('week.title_show') %>: <strong><%= @week.name %></strong> (<%= link_to raw(t('back')), admin_course_path(@course) %>)</h1>
 <p class="mb-4"><%= @week.description %></p>
+<%= render partial: '/admin/lessons/partials/index' %>
diff --git a/config/locales/pl/lessons.yml b/config/locales/pl/lessons.yml
index 9e4ba08..ecbb13a 100644
--- a/config/locales/pl/lessons.yml
+++ b/config/locales/pl/lessons.yml
@@ -19,6 +19,7 @@ pl:
         name: 'Nazwa'
         description: 'Opis'
         course: 'Kurs'
+        video: Plik Wideo
         week: 'Tydzień'
         informations: 'Dodatkowe Informacje'
         file: 'Plik'