Hjqreturn
/
pgfqe6ch8
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

conflict

Browse Source
dev_bj
jingquan huang 5 years ago
parent d699c91363 9bd9e16d3b
commit ebbf6bb6a1
22 changed files with 56 additions and 42 deletions
Show Stats Download Patch File Download Diff File

8
app/helpers/application_helper.rb
Unescape View File

@ -753,7 +753,7 @@ module ApplicationHelper
when 5 then '实训发布'
when 6 then '实训课程发布'
when 7 then '职业认证'
when 8 then '文库发布'
when 8 then '教学案例发布'
else '职业认证'
end
when 11
@ -3080,7 +3080,7 @@ module ApplicationHelper
elsif @syllabus
title << (@syllabus.title.nil? ? "课堂" : @syllabus.title)
else
title << (User.current.anonymous? ? "Educoder实践教学" : User.current.show_name)
title << (User.current.anonymous? ? "EduCoder实践教学" : User.current.show_name)
end
# if first_page.nil? || first_page.web_title.nil?
# title << Setting.app_title unless Setting.app_title == title.last
@ -4368,7 +4368,7 @@ module ApplicationHelper
elsif attachment.container_type == "Bid" && attachment.container && attachment.container.courses
course = attachment.container.courses.first
candown = User.current.member_of_course?(attachment.container.courses.first) || (course.is_public == 1 && attachment.is_public == 1)
elsif attachment.container_type == "Library" #文库允许下载
elsif attachment.container_type == "Library" #教学案例允许下载
candown = true
else
candown = (attachment.is_public == 1 || attachment.is_public == true)
@ -6490,7 +6490,7 @@ def visable_attachemnts_incourse course
member = course.members.where(:user_id => User.current.id).first
if member.try(:course_group_id).to_i == 0 && attachment.unified_setting
result << attachment
elsif attachment.attachment_group_settings.where("course_group_id = #{member.try(:course_group_id)} and publish_time > '#{Time.now}'").count == 0
elsif attachment.attachment_group_settings.where("course_group_id = #{member.try(:course_group_id).to_i} and publish_time > '#{Time.now}'").count == 0
result << attachment
end
end

4
app/models/tiding.rb
Unescape View File

@ -361,10 +361,10 @@ class Tiding < ActiveRecord::Base
when 'Library'
library = Library.find_by_id(container_id)
if tiding_type == 'Apply'
"申请发布文库：#{library.try(:title)}"
"申请发布教学案例：#{library.try(:title)}"
elsif tiding_type == 'System'
text = status == 1 ? "审核已通过" : "审核未通过，<br/>原因：#{extra}"
"你提交的发布文库申请：#{library.try(:title)}，#{text}"
"你提交的发布教学案例申请：#{library.try(:title)}，#{text}"
end
else
logger.error "error type: 1"

4
app/views/exercise/_exercise_student.html.erb
Unescape View File

@ -203,7 +203,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</li>
<% end %>
@ -250,7 +250,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</li>
<% end %>

4
app/views/exercise/_exercise_student_result.html.erb
Unescape View File

@ -156,7 +156,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</li>
<% end %>
@ -175,7 +175,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</li>
<% end %>

2
app/views/exercise/_show_MC.html.erb
Unescape View File

@ -23,7 +23,7 @@
<label class="fl color-grey3" for="sx_<%= exercise_choice.id %>">
<div class="fl">
<%= convert_to_char((index+1).to_s)%>
</div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
</label>
</li>
<% end %>

2
app/views/exercise/_show_MCQ.html.erb
Unescape View File

@ -23,7 +23,7 @@
<label class="fl color-grey3" for="dx_<%= exercise_choice.id %>">
<div class="fl">
<%= convert_to_char((index+1).to_s)%>
</div><pre class="fl ml10"><%= exercise_choice.choice_text%></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text%></xmp>
</label>
</li>
<% end %>

6
app/views/exercise/_statistics_result_table.html.erb
Unescape View File

@ -17,9 +17,9 @@
</li>
<% exercise_question.exercise_choices.reorder("choice_position").each do |exercise_choice| %>
<li class="clearfix">
<p class="pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>">
<%= exercise_choice.choice_text %>
</p>
<div class="width698 fl pl5 <%= exercise_question.exercise_standard_answers.first.exercise_choice_id.to_s.split('').include?(exercise_choice.choice_position.to_s) ? 'color-light-green' : '' %>">
<xmp class="xmplist"><%= exercise_choice.choice_text %></xmp>
</div>
<% count = exercise_choice.exercise_answers.where(:user_id => @user_ids).count %>
<p class="color-dark-grey"><%= count %></p>
<div class="panel-slider-bg mt13 fl">

4
app/views/exercise/student_exercise_list.html.erb
Unescape View File

@ -271,7 +271,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</div>
<% end %>
@ -288,7 +288,7 @@
<label class="fl color-grey3" for="exercise_<%= exercise_choice.id %>_exercise_choice_id">
<div class="fl">
<%= convert_to_char((index + 1).to_s) %>
</div><pre class="fl ml10"><%= exercise_choice.choice_text %></pre>
</div><xmp class="fl ml10 xmplist"><%= exercise_choice.choice_text %></xmp>
</label>
</div>
<% end %>

2
app/views/layouts/_logined_header.html.erb
Unescape View File

@ -18,7 +18,7 @@
</ul>
</li>
<% end %>
<li class="<%= params[:controller] == "libraries" ? "active" : "" %>"><%= link_to '教学案例', libraries_path %></li>
<li class="<%= params[:controller] == "competitions" ? " active" : "" %>"><%= link_to "竞赛", competitions_path %></li>
<li class="<%= params[:controller] == "forums" ? " active" : "" %>"><%= link_to "问答", forums_path %></li>
<% if User.current.ec_school.present? %>

2
app/views/layouts/base_management.html.erb
Unescape View File

@ -116,7 +116,7 @@
<li><%= link_to '单位审批', unit_managements_path %></li>
<li><%= link_to '实训发布', shixun_authorization_managements_path %></li>
<li><%= link_to '实训课程发布', subject_authorization_managements_path %></li>
<li><%= link_to '文库发布', library_applies_path(status: :pending) %></li>
<li><%= link_to '教学案例发布', library_applies_path(status: :pending) %></li>
</ul>
</li>
<li class="fl edu-admin-nav-li edu-position"><a href="javascript:void(0);" class="edu-admin-nav-a">认证+</a>

6
app/views/libraries/_form.html.erb
Unescape View File

@ -1,4 +1,4 @@
<p class="lineh-25 font-22 mb20">上传文档</p>
<p class="lineh-25 font-22 mb20">上传教学案例</p>
<div class="library-form-container">
<%= form_for(@library) do |f| %>
<%= hidden_field_tag :apply_publish, false %>
@ -7,7 +7,7 @@
<div class="clearfix mb20">
<span class="upload_Title">标题</span>
<li class="fl">
<%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-240-35 mr20 fl' %>
<%= f.text_field :title, placeholder: '例如：软件工程教学案例', class: 'greyInput winput-300-35 mr20 fl' %>
<p style="height:20px;line-height:20px;"><span class="color-red none" id="title_notice">请输入标题</span></p>
</li>
<span class="color-grey-c font-12 fl mt5">简明扼要介绍文档&视频所包含的主要的内容</span>
@ -78,7 +78,7 @@
autoFocus: false,
// 用于增加自定义工具栏的功能，可以直接插入HTML标签，不使用默认的元素创建图标
dialogMaskOpacity: 0.6,
placeholder: "请输入参考答案",
placeholder: "请添加描述",
imageUpload: true,
imageFormats: ["jpg", "jpeg", "gif", "png", "bmp", "webp", "JPG", "JPEG", "GIF", "PNG", "BMP", "WEBP"],
imageUploadURL: "<%= upload_with_markdown_path(container_id: 0, container_type: 'MarkDown') %>" //url

2
app/views/libraries/edit.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="educontent mb50">
<p class="mt10 mb20 clearfix lineh-20">
<%= link_to '文库', libraries_path, class: 'color-grey-9' %> &gt;
<%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> &gt;
<span class="color-grey-3">编辑</span>
</p>

4
app/views/libraries/index.html.erb
Unescape View File

@ -1,7 +1,7 @@
<div class="educontent">
<div class="edu-back-white mb30 mt30">
<p class="padding20-30 clearfix bor-bottom-greyE">
<span class="font-18 fl color-grey-3">文库</span>
<span class="font-18 fl color-grey-3">教学案例</span>
<%= link_to '新建', new_library_path, class: 'fr color-blue font-16 mt3' %>
</p>
<div class="clearfix pt20 pl30 pr30">
@ -15,7 +15,7 @@
</ul>
<div class="edu-position fr">
<%= hidden_field_tag(:type, params[:type]) %>
<input class="winput-240-30 panel-box-sizing" placeholder="输入文库标题、编号进行检索" type="text" id="search_name">
<input class="winput-240-30 panel-box-sizing" placeholder="输入教学案例标题、编号进行检索" type="text" id="search_name">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey" id="search"><i class="fa fa-search"></i></a>
</div>
</div>

2
app/views/libraries/new.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="educontent mb50">
<p class="mt10 mb20 clearfix lineh-20">
<%= link_to '文库', libraries_path, class: 'color-grey-9' %> &gt;
<%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> &gt;
<span class="color-grey-3">新建</span>
</p>

6
app/views/libraries/show.html.erb
Unescape View File

@ -3,7 +3,7 @@
%>
<div class="educontent mb50">
<p class="mt10 mb20 clearfix lineh-20">
<%= link_to '文库', libraries_path, class: 'color-grey-9' %> &gt;
<%= link_to '教学案例', libraries_path, class: 'color-grey-9' %> &gt;
<span class="color-grey-3">详情</span>
</p>
<p class="lineh-25 mb20 clearfix">
@ -100,8 +100,12 @@
});
$(function(){
var height=document.getElementById("private_reason_ul").offsetHeight;
var one=parseInt($("#private_reason_ul").find("li").eq(0).height())+10;
var two=parseInt($("#private_reason_ul").find("li").eq(1).height());
var plus=one+two;
if(parseInt(height)>166){
$("#actionPanel").html('点击展开<i class="iconfont icon-xiajiantou color-blue font-14 ml5"></i>');
$(".private_reason").css({maxHeight:plus+"px"});
}
})
</script>

6
app/views/managements/library_applies/index.html.erb
Unescape View File

@ -1,6 +1,6 @@
<div class="edu-class-container mb15">
<div class="edu-con-top clearfix">
<p class="ml15 fl color-grey">文库发布</p>
<p class="ml15 fl color-grey">教学案例发布</p>
</div>
<div class="edu-con-bg01 mt15">
<div class="edu-tab clearfix mb20">
@ -16,7 +16,7 @@
<div id="edu-tab-con-1">
<div class="mt10">
<div class="edu-position fr task-form-30 mb10 mr15">
<input class="task-form-100 panel-box-sizing" placeholder="输入文库标题、编号进行检索" type="text" id="search_name">
<input class="task-form-100 panel-box-sizing" placeholder="输入教学案例标题、编号进行检索" type="text" id="search_name">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt10" id="search"><i class="fa fa-search"></i></a>
</div>
<div class="cl"></div>
@ -34,7 +34,7 @@
<%= link_to "拒绝", library_applies_path(status: :refused), :class => "edu-filter-cir-grey mr5 fl font-12", :id => "library_reject_authentication", :remote => true %>
</p>
<div class="edu-position fr task-form-30 mb10 fr mr15">
<input class="task-form-100 panel-box-sizing" placeholder="输入文库标题、编号进行检索" type="text" id="library_search_name">
<input class="task-form-100 panel-box-sizing" placeholder="输入教学案例标题、编号进行检索" type="text" id="library_search_name">
<a href="javascript:void(0);" class="edu-btn-search font-16 color-grey mt10" id="library_search"><i class="fa fa-search"></i></a>
</div>
<div class="cl"></div>

2
config/locales/libraries/zh.yml
Unescape View File

@ -1,7 +1,7 @@
'zh':
activerecord:
models:
library: '文库'
library: '教学案例'
attributes:
library:
title: '标题'

12
config/routes.rb
Unescape View File

@ -26,7 +26,7 @@
# Example: :via => :get ====> :via => :get
RedmineApp::Application.routes.draw do ## oauth相关
# zhushi
match 'oauth', to: 'oauth#index'
match 'oauth/authorize', to: 'oauth#authorize', :via => [:get, :post]
match 'oauth/token', to: 'oauth#token', :via => :post
@ -52,6 +52,11 @@ RedmineApp::Application.routes.draw do ## oauth相关
end
end
# library
resources :libraries, :path => "moop_cases" do
get :publish_success, on: :collection
end
resources :ec_course_evaluations do
member do
match 'import_score', :via => [:post]
@ -2658,11 +2663,6 @@ RedmineApp::Application.routes.draw do ## oauth相关
resource :sso, only: [:show, :create]
# library
resources :libraries, :path => "moop_cases" do
get :publish_success, on: :collection
end
get '/:sub_dir_name', :to => 'org_subfields#show', :as => 'show_subfield_without_id'
Dir.glob File.expand_path("plugins/*", Rails.root) do |plugin_dir|

2
lib/trustie/sms/sms.rb
Unescape View File

@ -58,7 +58,7 @@ module Trustie
params['text'] = "【计算机实践教学】亲爱的#{user_name}老师，您已经成功报名参与了11月24日--25日在深圳大学举办的全国软件工程实践教学案例与应用研讨会，请准时参加。（如有任何参会问题，请致电咨询会务联系人汤老师13099740868）"
Rails.logger.info "#{params['text']}"
elsif send_type == 'publish_library'
params['text'] = "【Edu实训】亲爱的#{name}，有新的文库发布申请，请尽快处理"
params['text'] = "【Edu实训】亲爱的#{name}，有新的教学案例发布申请，请尽快处理"
Rails.logger.info "#{params['text']}"
end

1
public/react/src/modules/tpm/NewHeader.js
Unescape View File

@ -294,6 +294,7 @@ class NewHeader extends Component {
</ul>
</div>
</li>
<li><a href="/libraries">教学案例</a></li>
<li><a href="/competitions">竞赛</a></li>
<li className={`${activeForums === true ? 'active' : ''}`}><a href="/forums">问答</a></li>
<li className={`${activeCourses === true ? 'active' : ''}`} style={{display:ecUrl===null||ecUrl===undefined||ecUrl===""?'none':'block'}}><a href={ecUrl}>{ecUrl===null||ecUrl===undefined||ecUrl===""?'':'认证'}</a></li>

16
public/stylesheets/educoder/edu-all.css
Unescape View File

@ -706,12 +706,12 @@ li.challenge_box:last-child{
/*实践教学*/
.second_course_1{min-height: 782px;}
.second_course_1{min-height: 776px;}
.second_course_2{min-height: 823px;}
.second_course_3{min-height: 690px;}
.second_course_4{min-height: 523px;}
.second_course_4{min-height: 514px;}
.second_course_5{min-height: 737px;padding-top: 190px;box-sizing: border-box;position: relative}
.second_course_6{min-height: 1230px;}
.second_course_6{min-height: 1225px;}
.course_competition_panel{
margin:30px 40px 40px;border:1px solid #ABDCF1;background: #F1F8FD;justify-content: center;align-items: center;display: -webkit-flex;
height: 282px;text-align: center;
@ -3376,7 +3376,7 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
right: 20px;
}
/*文库*/
/*教学案例*/
.library_nav li{
float: left;cursor: pointer;margin-right: 30px;position: relative;color: #05101A;height: 40px;line-height: 20px;
font-size: 16px;
@ -3414,4 +3414,12 @@ line-height: 16px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
}
.changebtn{
width: 127px;font-size: 16px;height: 40px; line-height: 40px;
}
.xmplist{
margin-top:0px !important;
margin-bottom:0px !important;
}
.width698{
width: 698px;
}

1
public/stylesheets/educoder/edu-main.css
Unescape View File

@ -287,6 +287,7 @@ a.color-red-dd:hover{color: #C61616!important;}
.greyInput:focus{background-color: #fff;}
/*输入框样式---------宽度为固定长度*/
.winput-300-35{width: 300px;height: 35px;padding: 5px;box-sizing: border-box;}
.winput-240-45{width: 240px;height: 45px;padding: 5px;box-sizing: border-box;}
.winput-240-40{width: 240px;height: 40px;padding: 5px;box-sizing: border-box;}
.winput-240-35{width: 240px;height: 35px;padding: 5px;box-sizing: border-box;}

Write Preview
Loading…
Cancel
Save