diff --git a/app/models/competition.rb b/app/models/competition.rb index 96747b0b..7ccf067b 100644 --- a/app/models/competition.rb +++ b/app/models/competition.rb @@ -2,7 +2,7 @@ class Competition < ActiveRecord::Base # status 0:下架, 1:上架 attr_accessible :end_time, :identifier, :name, :online_time, :start_time, :status, :visits, :competition_lists_count, - :min_num, :max_num, :enroll_end_time, :sub_title + :min_num, :max_num, :enroll_end_time, :sub_title, :published_at has_many :competition_modules, :dependent => :destroy has_many :competition_stages, :dependent => :destroy diff --git a/app/models/shixun.rb b/app/models/shixun.rb index fe9a00b1..0d201ed3 100644 --- a/app/models/shixun.rb +++ b/app/models/shixun.rb @@ -66,18 +66,6 @@ class Shixun < ActiveRecord::Base #scope :visible, -> { where(status: -1) } after_create :send_tiding - def description - self.has_attribute?(:description) ? self[:description] : "" - end - - def propaedeutics - self.has_attribute?(:propaedeutics) ? self[:propaedeutics] : "" - end - - def evaluate_script - self.has_attribute?(:evaluate_script) ? self[:evaluate_script] : "" - end - def should_compile? self.mirror_repositories.published_main_mirror.first.try(:should_compile) end diff --git a/app/views/competitions/_qg_second_opensource.html.erb b/app/views/competitions/_qg_second_opensource.html.erb index a3384f6b..ec05b3c5 100644 --- a/app/views/competitions/_qg_second_opensource.html.erb +++ b/app/views/competitions/_qg_second_opensource.html.erb @@ -1,47 +1,71 @@ -
-
-
+<% index = 0 %> +
+<% index += 1 %> +
+<% index += 1 %> + +<% @competition.competition_stages.each_with_index do |stage, i| %> +
+ <% + first_section = stage.competition_stage_sections[0] + second_section = stage.competition_stage_sections[1] + %>

    - 开源任务征集 - 2019年7月1日~2019年7月20日 + <%= first_section.try(:name) %> + <%= first_section.start_time.try(:strftime, '%Y年%m月%d日') %> ~ <%= first_section.end_time.try(:strftime, '%Y年%m月%d日') %> - 开源任务发布 - 2019年7月21日 + <%= second_section.try(:name) %> + <%= second_section.try(:start_time).try(:strftime, '%Y年%m月%d日') %> ~ <%= second_section.try(:end_time).try(:strftime, '%Y年%m月%d日') %>

  • - 项目名称1 - 项目名称2 - 项目名称3 + <% is_start = Time.now > first_section.start_time %> + <% first_section.competition_entries.each_with_index do |entry, j| %> + <% + competition_url = User.current.logged? ? "#{entry.url}?eid=#{User.current.id}" : "#{entry.url}" + btn_url = is_start ? "#{competition_url}" : "javascript:void(0);" + %> + <%= entry.name %> + <% end %>
-
-
- -
-
-
-
-
\ No newline at end of file +<% index += 1 %> +<% end %> + +
+<% index += 1 %> +
+<% index += 1 %> +
+ + \ No newline at end of file diff --git a/app/views/competitions/index.html.erb b/app/views/competitions/index.html.erb index 9332dda9..b95bec63 100644 --- a/app/views/competitions/index.html.erb +++ b/app/views/competitions/index.html.erb @@ -69,13 +69,14 @@
<% elsif competition.published_at.present? %> + <% url = admin_or_business? ? competition_path(competition) : 'javascript:void(0)' %>
- + <%= image_tag(url_to_avatar(competition), :width => "100%", :height => "100%") %>
- <%= [competition.name, competition.sub_title.presence].compact.join('——') %> + <%= [competition.name, competition.sub_title.presence].compact.join('——') %>
即将发布 @@ -98,10 +99,12 @@
diff --git a/app/views/competitions/show.html.erb b/app/views/competitions/show.html.erb index 0df98a24..28200db3 100644 --- a/app/views/competitions/show.html.erb +++ b/app/views/competitions/show.html.erb @@ -13,5 +13,7 @@ <%= render :partial => "gq_second_code_competition" %> <% elsif @competition.identifier == "gcc-course-2019" %> <%= render :partial => "qg_second_course_competition" %> + <% elsif @competition.identifier == "gcc-project-2019" %> + <%= render :partial => "qg_second_opensource" %> <% end %>
\ No newline at end of file diff --git a/spec/factories/shixun_infos.rb b/spec/factories/shixun_infos.rb new file mode 100644 index 00000000..35c80a06 --- /dev/null +++ b/spec/factories/shixun_infos.rb @@ -0,0 +1,5 @@ +FactoryGirl.define do + factory :shixun_info do + + end +end diff --git a/spec/models/shixun_info_spec.rb b/spec/models/shixun_info_spec.rb new file mode 100644 index 00000000..988bdeae --- /dev/null +++ b/spec/models/shixun_info_spec.rb @@ -0,0 +1,5 @@ +require 'rails_helper' + +RSpec.describe ShixunInfo, :type => :model do + pending "add some examples to (or delete) #{__FILE__}" +end