From 1ae514ca4857d7e2ad53b338731c1e01f899fb4d Mon Sep 17 00:00:00 2001
From: cxt <pinecxt@163.com>
Date: Wed, 25 Nov 2015 09:38:13 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B5=8B=E9=AA=8C=E7=9A=84=E5=8F=91=E5=B8=83?=
 =?UTF-8?q?=E6=97=A5=E6=9C=9F=E5=92=8C=E6=B5=8B=E9=AA=8C=E6=97=B6=E9=95=BF?=
 =?UTF-8?q?=E5=81=9A=E6=88=90=E5=8F=AF=E9=80=89=E7=9A=84?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/exercise_controller.rb        |  5 +-
 app/views/exercise/_edit_head.html.erb        | 17 +++---
 app/views/exercise/_exercise_form.html.erb    | 60 +++++++++----------
 app/views/exercise/_exercise_teacher.html.erb |  8 ++-
 app/views/exercise/_show_head.html.erb        |  9 ++-
 public/stylesheets/courses.css                |  2 +-
 6 files changed, 53 insertions(+), 48 deletions(-)

diff --git a/app/controllers/exercise_controller.rb b/app/controllers/exercise_controller.rb
index 1598030a2..6fcbb0c6c 100644
--- a/app/controllers/exercise_controller.rb
+++ b/app/controllers/exercise_controller.rb
@@ -65,7 +65,6 @@ class ExerciseController < ApplicationController
         :end_time => "",
         :publish_time => "",
         :exercise_description => "",
-        :show_result => "",
         :show_result => 1
     }
     @exercise = Exercise.create option
@@ -104,10 +103,10 @@ class ExerciseController < ApplicationController
   def update
     @exercise.exercise_name = params[:exercise][:exercise_name]
     @exercise.exercise_description = params[:exercise][:exercise_description]
-    @exercise.time =  params[:exercise][:time]
+    @exercise.time =  params[:exercise][:time].blank? ? -1 : params[:exercise][:time]
     @exercise.end_time = params[:exercise][:end_time]
     @exercise.publish_time = params[:exercise][:publish_time]
-    @exercise.show_result = params[:exercise][:show_result]
+    @exercise.show_result = params[:exercise][:show_result].blank? ? 1 : params[:exercise][:show_result]
     if @exercise.save
       respond_to do |format|
         format.js
diff --git a/app/views/exercise/_edit_head.html.erb b/app/views/exercise/_edit_head.html.erb
index 3090cc2c5..6c357130c 100644
--- a/app/views/exercise/_edit_head.html.erb
+++ b/app/views/exercise/_edit_head.html.erb
@@ -6,18 +6,17 @@
       <%# if edit_mode %>
       <!--<label class="fl c_grey f14" style="margin-top: 4px;">发布日期(可选)：</label>-->
       <%# end %>
-      <div class="calendar_div fl mr10">
-        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if exercise.publish_time %>"  >
-        <%= calendar_for('exercise_publish_time')%>
-      </div>
-      <%# if edit_mode %>
-      <!--<label class="fl c_grey f14" style="margin-top: 4px;">截止日期：</label>-->
-      <%# end %>
+      <label class="fl c_grey f14" style="margin-top: 4px;">截止时间：</label>
       <div class="calendar_div fl">
-        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"  >
+        <input  type="text" name="exercise[end_time]" id="exercise_end_time" placeholder="截止时间" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d") if exercise.end_time %>"/>
         <%= calendar_for('exercise_end_time')%>
       </div>
-      <div class="fl ml10 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" value="<%=exercise.time %>" />分钟</div>
+      <div class="fl ml15 f14 fontGrey2"><span class="mr5">测验时长:</span><input name="exercise[time]" id="exercise_time" type="text" class="examTime mr5" placeholder="不填即不限时" value="<%=exercise.time if exercise.time!= -1 %>" />分钟</div>
+      <label class="fl c_grey ml15 f14" style="margin-top: 4px;">发布时间(可选)：</label>
+      <div class="calendar_div fl">
+        <input  type="text" name="exercise[publish_time]" id="exercise_publish_time" placeholder="发布时间(可选)" class="InputBox fl W120 calendar_input" readonly="readonly" value="<%= Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d") if !exercise.publish_time.nil? %>"/>
+        <%= calendar_for('exercise_publish_time')%>
+      </div>
       <div class="cl"></div>
       <textarea class="testDes mt10" name="exercise[exercise_description]" id="exercise_description" placeholder="发布须知：试题类型有选择和填空两种，其中选择题包括单选题和多选题。您可以在此处填写测验相关说明。" ><%=exercise.exercise_description %></textarea>
       <div class="ur_editor_footer" style="padding-top: 10px;">
diff --git a/app/views/exercise/_exercise_form.html.erb b/app/views/exercise/_exercise_form.html.erb
index 1f415886f..cabd0b5e4 100644
--- a/app/views/exercise/_exercise_form.html.erb
+++ b/app/views/exercise/_exercise_form.html.erb
@@ -112,14 +112,10 @@
         var title = $.trim($("#exercise_name").val());
         if(title.length == 0){
             alert("测验标题不能为空");
-        } else if($.trim($("#exercise_publish_time").val()) =="") {
-            alert("发布时间不能为空");
         } else if($.trim($("#exercise_end_time").val()) =="") {
             alert("截止时间不能为空");
-        } else if($.trim($("#exercise_time").val()) =="") {
-            alert("考试时长不能为空");
-        } else if(Date.parse($("#exercise_end_time").val()) <= Date.parse($("#exercise_publish_time").val())) {
-            alert("截止时间必须大于发布时间");
+        } else if(Date.parse($("#exercise_end_time").val()) < Date.now()) {
+            alert("截止时间不能小于当前时间");
         }
         else {
             doc.parent().parent().parent().submit();
@@ -162,33 +158,35 @@
     }
 </script>
 <div class="homepageRight mt0 ml10">
-<div class="resources">
-  <!-- 头部 -->
-  <div id="polls_head_show"  style="display: none;">
-    <%= render :partial => 'show_head', :locals => {:exercise => @exercise}%>
-  </div>
-  <div id="polls_head_edit">
-    <%= render :partial => 'edit_head', :locals => {:exercise => @exercise}%>
-  </div>
-  <% current_score = get_current_score @exercise %>
-  <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%=current_score %>分</span></div>
-  <!-- 问题 -->
-  <div id="poll_content">
-    <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise}%>
-  </div>
+  <div class="resources">
+    <!-- 头部 -->
+    <div id="polls_head_show" style="display: none;">
+      <%= render :partial => 'show_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <div id="polls_head_edit">
+      <%= render :partial => 'edit_head', :locals => {:exercise => @exercise} %>
+    </div>
+    <% current_score = get_current_score @exercise %>
+    <div class="mb5" style="display: <%= current_score == 0 ? "none" : "" %>" id="current_score_div">目前试卷总分：<span class="c_red" id="current_score"><%= current_score %>
+      分</span></div>
+    <!-- 问题 -->
+    <div id="poll_content">
+      <%= render :partial => 'exercise_content', :locals => {:exercise => @exercise} %>
+    </div>
 
-  <div class="testQuestion" id="new_exercise_question">
-    <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
-  </div><!--选项 end-->
+    <div class="testQuestion" id="new_exercise_question">
+      <%= render :partial => 'new_question', :locals => {:exercise => @exercise} %>
+    </div>
+    <!--选项 end-->
 
-  <!-- 新增问题 -->
-  <div id="new_poll_question">
-  </div>
+    <!-- 新增问题 -->
+    <div id="new_poll_question">
+    </div>
 
-  <div id="exercise_submit">
-    <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    <div id="exercise_submit">
+      <%= render :partial => 'exercise_submit', :locals => {:exercise => @exercise} %>
+    </div>
+    <div class="cl"></div>
+    <!--contentbox end-->
   </div>
-  <div class="cl"></div>
-  <!--contentbox end-->
-</div>
 </div><!--编辑end-->
diff --git a/app/views/exercise/_exercise_teacher.html.erb b/app/views/exercise/_exercise_teacher.html.erb
index a3f6380cf..0a96b782b 100644
--- a/app/views/exercise/_exercise_teacher.html.erb
+++ b/app/views/exercise/_exercise_teacher.html.erb
@@ -10,9 +10,13 @@
     <div class="testStatus"><!--头部显示 start-->
       <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
       <div class="fontGrey2">
-        <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <% unless exercise.publish_time.nil? %>
+            <span class="mr130">发布时间：<%=format_time(exercise.publish_time.to_s) %></span>
+        <% end %>
         <span class="mr130">截止时间：<%=format_time(exercise.end_time.to_s) %></span>
-        <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% if exercise.time != -1 %>
+            <span class="fr">测验时长：<%=exercise.time %>分钟</span>
+        <% end %>
       </div>
       <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
       <div class="cl"></div>
diff --git a/app/views/exercise/_show_head.html.erb b/app/views/exercise/_show_head.html.erb
index ac7c1c162..16a572583 100644
--- a/app/views/exercise/_show_head.html.erb
+++ b/app/views/exercise/_show_head.html.erb
@@ -3,9 +3,14 @@
   <!--  <a class='ur_icon_add' title='导入' id="import_btn" onclick="importPoll();"></a> -->
   <h1 class="ur_page_title" id="polls_name_h"><%= exercise.exercise_name%></h1>
   <div class="fontGrey2">
-    <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <% unless exercise.publish_time.nil? %>
+        <span class="mr100">发布时间：<%=Time.parse(format_time(exercise.publish_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.publish_time%></span>
+    <% end %>
     <span class="mr100">截止时间：<%=Time.parse(format_time(exercise.end_time)).strftime("%Y-%m-%d %H:%M:%S") if exercise.end_time %></span>
-    <span>测验时长：<%= exercise.time %>分钟</span></div>
+    <% if exercise.time != -1 %>
+        <span>测验时长：<%= exercise.time %>分钟</span>
+    <% end %>
+  </div>
   <div class="testDesEdit mt5"><%= exercise.exercise_description.nil? ? "" : exercise.exercise_description.html_safe%></div>
   <div class="cl"></div>
   <div class="cl"></div>
diff --git a/public/stylesheets/courses.css b/public/stylesheets/courses.css
index 5ff34a4e1..b7a742994 100644
--- a/public/stylesheets/courses.css
+++ b/public/stylesheets/courses.css
@@ -1156,7 +1156,7 @@ a:hover.btn_cancel{ color:#666;}
 .mr118 {margin-right:118px !important;}
 .questionContainer {width:698px; border:1px solid #cbcbcb;background:#eeeeee; padding:10px; margin-bottom:10px;}
 .questionTitle{ width:644px; height:30px; border:1px solid #cbcbcb; padding-left:5px; background:#fff;}
-.examTime {width:40px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; }
+.examTime {width:90px; border:1px solid #cbcbcb; outline:none; height:28px; text-align:center; padding-left:0px; }
 .testStatus{width:698px; border:1px solid #cbcbcb; padding:10px; margin-bottom:10px; background:#ffffff; position:relative; color:#767676;}
 .testEdit{ background:url(images/icons.png) 0px -272px no-repeat; width:16px; height:27px; display:block;float:right; bottom:10px; right:10px; position:absolute;}
 a:hover.testEdit{ background:url(images/icons.png) -21px -272px  no-repeat;}