Merge branch 'dev_aliyun' of https://bdgit.educoder.net/Hjqreturn/educoder into dev_aliyun

app/controllers/admins/competitions_controller.rb

@@ -0,0 +1,15 @@
+class Admins::CompetitionsController < Admins::BaseController
+
+  def index
+    params[:sort_by] = params[:sort_by].presence || 'created_on'
+    params[:sort_direction] = params[:sort_direction].presence || 'desc'
+    @competitions = custom_sort Competition.all, params[:sort_by], params[:sort_direction]
+    @params_page = params[:page] || 1
+    @competitions = paginate @competitions
+
+    respond_to do |format|
+      format.js
+      format.html
+    end
+  end
+end

app/controllers/course_modules_controller.rb

@@ -2,7 +2,8 @@ class CourseModulesController < ApplicationController
   before_action :require_login, :check_auth
   before_action :set_module, except: [:unhidden_modules]
   before_action :find_course, only: [:unhidden_modules]
-  before_action :teacher_or_admin_allowed
+  before_action :teacher_or_admin_allowed, except: [:add_second_category]
+  before_action :teacher_allowed, only: [:add_second_category]
 
   # 模块置顶
   def sticky_module

app/models/attachment.rb

@@ -98,7 +98,7 @@ class Attachment < ApplicationRecord
 
   def become_history
     history = self.attachment_histories.first
-    new_attachment_history = AttachmentHistory.new(self.attributes.except("id", "resource_bank_id", "unified_setting", "course_second_category_id").merge(
+    new_attachment_history = AttachmentHistory.new(self.attributes.except("id", "resource_bank_id", "unified_setting", "course_second_category_id", "delay_publish").merge(
         attachment_id: self.id,
         version: history.nil? ? 1 :  history.version + 1,
     ))
@@ -106,7 +106,7 @@ class Attachment < ApplicationRecord
   end
 
   def copy_attributes_from_new_attachment(new_attachment)
-    self.attributes = new_attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes",'is_publish','publish_time')
+    self.attributes = new_attachment.attributes.dup.except("id","container_id","container_type","is_public","downloads", "quotes",'is_publish','publish_time', "delay_publish")
   end
 
   def set_public(is_public)

app/models/competition_mode_setting.rb

@@ -0,0 +1,3 @@
+class CompetitionModeSetting < ApplicationRecord
+  belongs_to :course
+end

app/views/admins/competitions/index.html.erb

@@ -0,0 +1,7 @@
+<% define_admin_breadcrumbs do %>
+  <% add_admin_breadcrumb('竞赛列表', admins_competitions_path) %>
+<% end %>
+
+<div class="box competitions-list-container">
+  <%= render partial: 'admins/shixuns/shared/list', locals: { shixuns: @shixuns } %>
+</div>

app/views/admins/shared/_sidebar.html.erb

@@ -66,6 +66,8 @@
       <% end %>
     </li>
 
+    <li><%= sidebar_item(admins_competitions_path, '竞赛', icon: 'trophy', controller: 'admins-competitions') %></li>
+
     <li>
       <%= sidebar_item_group('#setting-submenu', '网站建设', icon: 'cogs') do %>
         <li><%= sidebar_item(admins_carousels_path, '轮播图', icon: 'image', controller: 'admins-carousels') %></li>

app/views/competitions/competitions/index.json.jbuilder

@@ -20,7 +20,7 @@ json.competitions do
     if section
       json.current_stage do
 
-        json.name = section.competition_stage.name
+        json.name section.competition_stage.name
         json.start_time section.display_start_time
         json.end_time section.display_end_time
       end

app/views/courses/mine.json.jbuilder

@@ -1,5 +1,6 @@
 json.partial! "commons/success"
-json.data do
-  json.array! @courses, :id, :name, :updated_at, :created_at, :end_date
+json.data @courses do |course|
+  json.(course, :id, :name, :updated_at, :end_date)
+  json.created_at course.created_at.strftime("%Y-%m-%d")
 end
 

config/routes.rb

@@ -980,6 +980,8 @@ Rails.application.routes.draw do
       resource :laboratory_setting, only: [:show, :update]
       resource :laboratory_user, only: [:create, :destroy]
     end
+
+    resources :competitions, only: [:index, :destroy]
   end
 
   resources :colleges, only: [] do

db/migrate/20191015013924_add_new_column_to_competitions.rb

@@ -0,0 +1,6 @@
+class AddNewColumnToCompetitions < ActiveRecord::Migration[5.2]
+  def change
+    add_column :competitions, :bonus, :integer, default: 0
+    add_column :competitions, :mode, :integer, default: 0
+  end
+end

db/migrate/20191015015723_create_competition_mode_settings.rb

@@ -0,0 +1,11 @@
+class CreateCompetitionModeSettings < ActiveRecord::Migration[5.2]
+  def change
+    create_table :competition_mode_settings do |t|
+      t.references :course
+      t.datetime :start_time
+      t.datetime :end_time
+
+      t.timestamps
+    end
+  end
+end

spec/models/competition_mode_setting_spec.rb

@@ -0,0 +1,5 @@
+require 'rails_helper'
+
+RSpec.describe CompetitionModeSetting, type: :model do
+  pending "add some examples to (or delete) #{__FILE__}"
+end