hushasha
/
trustieforge
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

作品修改功能

Browse Source
sw_new_course
sw 10 years ago
parent 4d43cd2765
commit 19bf8ef50d
6 changed files with 69 additions and 77 deletions
Show Stats Download Patch File Download Diff File

26
app/controllers/student_work_controller.rb
Unescape View File

@ -72,11 +72,31 @@ class StudentWorkController < ApplicationController
end end
def edit def edit
respond_to do |format|
format.html
end
end end
def update def update
if params[:student_work]
@work.name = params[:student_work][:name]
@work.description = params[:student_work][:description]
@work.project_id = params[:student_work][:project]
@work.save_attachments(params[:attachments])
render_attachment_warning_if_needed(@work)
if @work.save
respond_to do |format|
format.html {
flash[:notice] = l(:notice_successful_edit)
redirect_to student_work_index_url(:homework => @homework.id)
}
end
return
end
end
respond_to do |format|
format.html{redirect_to edit_student_work_url(@work)}
end
end end
def show def show
@ -208,7 +228,7 @@ class StudentWorkController < ApplicationController
#判断是不是当前作品的提交者 #判断是不是当前作品的提交者
#提交者可以编辑作品 #提交者可以编辑作品
def author_of_work def author_of_work
render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 ) # render_403 unless User.current.id == @work.user_id && (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 1 )
end end
#根据条件过滤作业结果 #根据条件过滤作业结果

2
app/helpers/application_helper.rb
Unescape View File

@ -2298,7 +2298,7 @@ module ApplicationHelper
link_to l(:label_commit_homework), new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit' link_to l(:label_commit_homework), new_student_work_path(:homework => homework.id),:class => 'fr mr10 work_edit'
else else
if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前 if homework.homework_type == 1 && homework.homework_detail_manual && homework.homework_detail_manual.comment_status != 1 #匿评作业，且作业状态不是在开启匿评之前
"<span class='fr mr10 pr_join_span ' title='已开启匿评不能修改作品'>#{l(:label_edit_homework)}</span>".html_safe "<span class='fr mr10 pr_join_span '>#{l(:label_edit_homework)}</span>".html_safe
else else
link_to l(:label_edit_homework), edit_student_work_path(work.id),:class => 'fr mr10 work_edit' link_to l(:label_edit_homework), edit_student_work_path(work.id),:class => 'fr mr10 work_edit'
end end

2
app/views/student_work/_show.html.erb
Unescape View File

@ -11,7 +11,7 @@
<a href="javascript:void(0);" class=" pic_del" ></a> <a href="javascript:void(0);" class=" pic_del" ></a>
</li> </li>
<li class="fr" > <li class="fr" >
<a href="javascript:void(0);" class=" pic_edit" ></a> <%= link_to "",edit_student_work_path(@work),:class => "pic_edit"%>
</li> </li>
<% end%> <% end%>
<% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%> <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 --> <% if (@homework.homework_type != 1 || @homework.homework_detail_manual.comment_status == 3) && @work.user != User.current%> <!-- 普通作业或者编程作业，或者是匿评结束阶段，显示点赞按钮 -->

100
app/views/student_work/edit.html.erb
Unescape View File

@ -2,98 +2,58 @@
<h2 class="project_h2">编辑作品</h2> <h2 class="project_h2">编辑作品</h2>
</div> </div>
<div class="Newwork"> <div class="Newwork">
<div id="tb_" class="hwork_tb_"> <!--<div id="tb_" class="hwork_tb_">-->
<ul> <!--<ul>-->
<li id="tb_1" class="hwork_hovertab" onclick="x:HoverLi(1);" > <!--<li id="tb_1" class="hwork_hovertab" onclick="x:HoverLi(1);" >-->
课程名称课程名称课程名</li> <!--课程名称课程名称课程名</li>-->
<li id="tb_2" class="hwork_normaltab" onclick="i:HoverLi(2);"> <!--<li id="tb_2" class="hwork_normaltab" onclick="i:HoverLi(2);">-->
成员</li> <!--成员</li>-->
</ul> <!--</ul>-->
<!--</div>-->
</div>
<div class="hwork_ctt"> <div class="hwork_ctt">
<div class="hwork_dis" id="tbc_01"> <div class="hwork_dis" id="tbc_01">
<%= labelled_form_for @work do |f|%>
<div class="N_con"> <div class="N_con">
<p> <p>
<label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label> <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
<input id="" type="text" name="" class=" bo mb10 fl" placeholder="作品名称"> <input type="text" name="student_work[name]" id="student_work_name" class="bo fl" maxlength="200" onkeyup="regexStudentWorkName();" value="<%= @work.name%>">
<a href="#" class="fl ml10 mt3" onclick="show_project();" >项目信息<img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15" Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。"></a> <a href="javascript:void(0)" class="fl ml10 mt3" onclick="show_project();" >项目信息
<img class="ml5 " src="/images/bid/pic_question.png" width="15" height="15" Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
</a>
<div class="cl"></div>
<p id="student_work_name_span" class="c_red ml90 mb10"></p>
</p> </p>
<div class="cl"></div> <div class="cl"></div>
<p id="about_project" class="about_project" >
<p id="about_project" class="about_project" style="<%= @work.project.nil? ? '' : 'display:block;'%>">
<label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label> <label class="fl">&nbsp;&nbsp;&nbsp;关联项目&nbsp;&nbsp;&nbsp;&nbsp;：</label>
<select name="" id="" class=" bo02 mb10"> <%= f.select :project,options_for_select(user_projects_option,@work.project_id), {},{:class => "bo02 mb10"} %>
<option value="1">没有可选项目，请直接为本作品创建一个项目</option>
<option value="2">M</option>
</select>
<a class=" ml10 mt3 c_orange" href="javascript:void(0)" onClick="show_window();">快速创建</a>
</p> </p>
<div class="cl"></div> <div class="cl"></div>
<p> <p>
<label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：</label> <label class="fl">
<textarea id="" name="" placeholder="最多3000个汉字(或6000个英文字符)" class="w620 hwork_txt mb10 " ></textarea> <span class="c_red">*</span>
&nbsp;作品描述&nbsp;&nbsp;&nbsp;&nbsp;：
</label>
<textarea name="student_work[description]" placeholder="最多3000个汉字(或6000个英文字符)" id="student_work_description" class="w620 hwork_txt" maxlength="6000" onkeyup="regexStudentWorkDescription();"><%= @work.description%></textarea>
<p id="student_work_description_textarea" class="c_red ml90 mb10"></p>
</p> </p>
<div class="cl"></div> <div class="cl"></div>
<p> <p>
<label>&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label> <label class="fl">&nbsp;&nbsp;&nbsp;添加附件&nbsp;&nbsp;&nbsp;&nbsp;：</label>
<input type="submit" name="" value="文件浏览" class="sub_btn" >&nbsp;&nbsp;&nbsp;&nbsp;<span class="c_grey">-文件不超过200MB</span> <%= render :partial => 'attachments/new_form',:locals => {:container => @work} %>
</p> </p>
<div class="cl"></div> <div class="cl"></div>
<p class="ml80 "> <p class="ml80 ">
<a href="#" target="_blank" class="blue_btn fl c_white">提交作品</a><a href="#" target="_blank" class="blue_btn grey_btn fl c_white">重&nbsp;&nbsp;置</a> <a href="javascript:void(0)" target="_blank" class="blue_btn fl c_white" onclick="edit_student_work(<%= @work.id%>);">提交作品</a>
<%= link_to "返&nbsp;&nbsp;回".html_safe, student_work_index_path(:homework => @homework), :class => "blue_btn grey_btn fl c_white"%>
<div class="cl"></div> <div class="cl"></div>
</p> </p>
</div><!---创建作业内容结束--> </div><!---创建作业内容结束-->
<% end%>
</div> </div>
<div class="hwork_undis" id="tbc_02">
<div class="members_left">
<ul style=" border-bottom:none;">
<li><span class="w150 f_b" >用户</span><span class="w150 f_b">角色</span><span></span></li>
<li ><a href="#" class="w150 c_orange fl">gugu01</a><span class="w150 fl">发布人员</span><a href="#" class="c_dblue w90 fl">删除</a></li>
<li ><a href="#" class="w150 c_orange fl">gugu01</a><span class="w150 fl">发布人员</span><a href="#" class="c_dblue w90 fl">删除</a></li>
<li ><a href="#" class="w150 c_orange fl">gugu01</a><span class="w150 fl">发布人员</span><a href="#" class="c_dblue w90 fl">删除</a></li>
<li ><a href="#" class="w150 c_orange fl">gugu01</a><span class="w150 fl">发布人员</span><a href="#" class="c_dblue w90 fl">删除</a></li>
<li ><a href="#" class="w150 c_orange fl">gugu01</a><span class="w150 fl">发布人员</span><a href="#" class="c_dblue w90 fl">删除</a></li>
</ul>
</div><!-- 左边-->
<div class="members_right">
<p class="c_blue fb mt10 mb5">添加成员</p>
<div class="member_search">
<input class="member_search_input fl" type="text" name="" value="输入用户名称搜索好友"><a class="invi_search_btn fl c_white" >搜索</a>
<div class="cl"></div>
<ul class="mb5">
<li><input type="checkbox" name="" checked=""> <label >suntao</label> </li>
<li><input type="checkbox" name="" > <label >suntaoalibb</label> </li>
<li><input type="checkbox" name="" > <label >用户名称</label> </li>
<li><input type="checkbox" name="" > <label >suntao</label> </li>
<li><input type="checkbox" name="" checked=""> <label >suntao</label> </li>
<li><input type="checkbox" name="" > <label >suntaoalibb</label> </li>
<li><input type="checkbox" name="" > <label >用户名称</label> </li>
<li><input type="checkbox" name="" > <label >suntao</label> </li>
<li><input type="checkbox" name="" > <label >用户名称</label> </li>
<li><input type="checkbox" name="" > <label >suntao</label> </li>
</ul>
<div class="cl"></div>
<ul class="wlist mr40" >
<li><a href="#">下一页</a></li>
<li><a href="#">...</a></li>
<li><a href="#">2</a></li>
<li class="wlist_select" ><a href="#">1</a></li>
<li><a href="#">上一页</a></li>
</ul>
<div class="cl"></div>
<ul class="rolebox mb10 mt10">
<li class="fb">角色： </li>
<li ><input class="fl" type="checkbox" name="" checked=""> <label >Manager</label> </li>
<li ><input type="checkbox" name="" > <label >Developer</label> </li>
<li ><input type="checkbox" name="" > <label >Reporter</label> </li>
</ul>
<div class="cl"></div>
<a href="#" class="member_btn">新增成员</a>
</div>
</div><!-- 右边 end-->
</div><!---成员结束-->
</div> </div>
</div> </div>
</div><!--新建作业结束--> </div><!--新建作业结束-->

4
app/views/student_work/new.html.erb
Unescape View File

@ -14,7 +14,9 @@
<p> <p>
<label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label> <label class="fl"><span class="c_red">*</span>&nbsp;&nbsp;作品名称&nbsp;&nbsp;&nbsp;&nbsp;：</label>
<%= f.text_field "name", :required => true, :size => 60, :class => "bo fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %> <%= f.text_field "name", :required => true, :size => 60, :class => "bo fl", :maxlength => 200, :placeholder => "作品名称", :onkeyup => "regexStudentWorkName();" %>
<a href="javascript:void(0)" class="fl ml10 mt3" onclick="show_project();" >项目信息<img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15" Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。"></a> <a href="javascript:void(0)" class="fl ml10 mt3" onclick="show_project();" >项目信息
<img class="ml5 " src="../images/bid/pic_question.png" width="15" height="15" Title="项目是一种由用户创建的基于&#10;网络的协作空间，能够为个人&#10;或小组提供分布式的协同交流&#10;和资料管理等方面的。">
</a>
<div class="cl"></div> <div class="cl"></div>
<p id="student_work_name_span" class="c_red ml90 mb10"></p> <p id="student_work_name_span" class="c_red ml90 mb10"></p>
</p> </p>

12
public/javascripts/course.js
Unescape View File

@ -652,6 +652,12 @@ function new_student_work()
{$("#new_student_work").submit();} {$("#new_student_work").submit();}
} }
function edit_student_work(id)
{
if(regexStudentWorkName()&&regexStudentWorkDescription())
{$("#edit_student_work_" + id).submit();}
}
//滑动打分 //滑动打分
$.fn.peSlider = function(settings){ $.fn.peSlider = function(settings){
//configurable options (none so far) //configurable options (none so far)
@ -799,4 +805,8 @@ function SearchByName(obj,url,event)
if(keycode == '13'){ if(keycode == '13'){
location.href = url + "&name=" + obj.val(); location.href = url + "&name=" + obj.val();
} }
} }
$(function(){
$("#about_project label").eq(1).remove();
});
Write Preview
Loading…
Cancel
Save