Merge branch 'develop' into szzh

app/controllers/homework_attach_controller.rb

@@ -26,6 +26,7 @@ class HomeworkAttachController < ApplicationController
     get_not_batch_homework_list sort,direction, @bid.id
     @cur_page = params[:page] || 1
     @cur_type = 1
+    @cur_sort,@cur_direction =  params[:sort] || "s_socre", params[:direction] || "desc"
     @direction = direction == 'asc'? 'desc' : 'asc'
     respond_to do |format|
       format.js
@@ -433,7 +434,7 @@ class HomeworkAttachController < ApplicationController
   #添加留言
   def addjours
     @is_teacher,@is_anonymous_comments,@m_score = params[:is_teacher]=="true",params[:is_anonymous_comments]=="true",params[:stars_value]
-    @cur_page,@cur_type = params[:cur_page] || 1,params[:cur_type] || 5
+    @cur_page,@cur_type = params[:page] || 1,params[:cur_type] || 5
     @homework = HomeworkAttach.find(params[:homework_id])
     @stars_reates = @homework.rates(:quality)
     homework = @homework
@@ -479,7 +480,7 @@ class HomeworkAttachController < ApplicationController
 
     if @cur_type == "1" #如果当前是老师未批列表，需要刷新整个作业列表界面
       @bid = @homework.bid
-      get_not_batch_homework_list "s_socre","desc",@homework.bid_id
+      get_not_batch_homework_list params[:cur_sort] || "s_socre",params[:cur_direction] || "desc",@homework.bid_id
     elsif @cur_type == "2" #老师已批列表
       @result_homework = HomeworkAttach.find_by_sql("SELECT homework_attaches.*,
             (SELECT stars FROM seems_rateable_rates WHERE rateable_type = 'HomeworkAttach' AND rateable_id = homework_attaches.id AND is_teacher_score = 1 AND stars IS NOT NULL ORDER BY updated_at DESC limit 0,1) AS t_score,

app/controllers/poll_controller.rb

@@ -1,7 +1,7 @@
 class PollController < ApplicationController
-  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll]
+  before_filter :find_poll_and_course, :only => [:edit,:update,:destroy,:show,:statistics_result,:create_poll_question,:commit_poll,:commit_answer,:publish_poll,:republish_poll,:poll_result]
   before_filter :find_container, :only => [:new,:create, :index]
-  before_filter :is_member_of_course, :only => [:index,:show]
+  before_filter :is_member_of_course, :only => [:index,:show,:poll_result]
   before_filter :is_course_teacher, :only => [:new,:create,:edit,:update,:destroy,:publish_poll,:republish_poll]
   include PollHelper
   def index
@@ -330,6 +330,14 @@ class PollController < ApplicationController
     end
   end
 
+  #显示某个学生某份问卷的填写结果
+  def poll_result
+    @poll_questions = paginateHelper @poll.poll_questions,5
+    respond_to do |format|
+      format.html{render :layout => 'base_courses'}
+    end
+  end
+
   private
   def find_poll_and_course
     @poll = Poll.find params[:id]

app/controllers/projects_controller.rb

@@ -35,7 +35,7 @@ class ProjectsController < ApplicationController
 # edit
   before_filter :authorize1, :only => [:show]
 #
-  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches]
+  before_filter :find_project, :except => [ :index, :search,:list, :new, :create, :copy, :statistics, :new_join, :course, :enterprise_course, :course_enterprise,:view_homework_attaches,:join_project]
   # before_filter :authorize, :except => [:new_join, :new_homework, :homework, :statistics, :search, :watcherlist, :index, :list, :new, :create, :copy, :archive, :unarchive, :destroy, :member, :focus, :file, 
   #               :statistics, :feedback, :course, :enterprise_course, :course_enterprise, :project_respond, :share,
   #               :show_projects_score, :issue_score_index, :news_score_index, :file_score_index, :code_submit_score_index, :projects_topic_score_index]
@@ -917,6 +917,14 @@ class ProjectsController < ApplicationController
       end
     end
   end
+
+  #加入私有项目
+  def join_project
+    respond_to do |format|
+      format.js
+    end
+  end
+
   private
 
   def memberAccess

app/helpers/poll_helper.rb

@@ -73,5 +73,5 @@ module PollHelper
       "多行主观题"
     end
   end
-  
+
 end

app/views/homework_attach/_addjour.html.erb

@@ -31,7 +31,7 @@
              :url => {:controller => 'homework_attach',
                       :action => 'addjours',
                       :homework_id => homework_attach.id,
-                      :cur_page => cur_page,
+                      :page => cur_page,
                       :cur_type => cur_type,
                       :is_anonymous_comments => @is_anonymous_comments,
                       :is_teacher => @is_teacher

app/views/homework_attach/_homework.html.erb

@@ -19,7 +19,7 @@
   <% else %>
       <% homework_filename = homework.name %>
   <% end %>
-  <%= link_to homework_filename , homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type), :title => homework_filename, :remote => true%>
+  <%= link_to homework_filename , homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type,:cur_sort => @cur_sort, :cur_direction => @cur_direction), :title => homework_filename, :remote => true%>
   <span class="c_grey ">
     提交时间：
     <%= format_time homework.created_at%>
@@ -46,7 +46,7 @@
 <% if is_teacher %>
     <!-- 是老师，所有列表正常显示 -->
     <li class="wping">
-      <%= link_to l(:label_work_rating),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type),:remote => true  %>
+      <%= link_to l(:label_work_rating),homework_attach_path(homework,:cur_page => @cur_page,:cur_type => @cur_type,:cur_sort => @cur_sort, :cur_direction => @cur_direction),:remote => true  %>
       <% if Time.parse(bid.deadline.to_s).strftime("%Y-%m-%d") < Time.parse(homework.created_at.to_s).strftime("%Y-%m-%d") %>
           <span class="c_red">&nbsp;&nbsp;迟交！</span>
       <% end %>

app/views/layouts/base_courses.html.erb

@@ -300,13 +300,22 @@
 
     <div class="user_underline"></div>
 
+    <style type="text/css">
+        .polls_btn{ height:33px;border-top:0 solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px; padding:7px 0 0 15px; }
+        .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
+        .polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
+        .polls_btn a{ float:left;}
+        .polls_n{float: left;background: #ff5d31;color: #fff;width: 12px;padding-left: 2px;height: 7px;padding-bottom: 5px;padding-top: 3px;margin-top: -4px;margin-left: 3px; }
+        .polls_n p{ margin-top:-4px;}
+        .cl{ clear:both; overflow:hidden; }
+    </style>
     <div class="polls_btn">
       <!--<a href="#">问卷调查<span >（12）</span></a>-->
-      <style type="text/css">
-          .polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:224px !important; padding:7px 0 0 15px; }
-          .polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
-      </style>
       <%= link_to l(:label_poll), poll_index_path(:polls_type => "Course", :polls_group_id => @course.id)%>
+      <div class="polls_n">
+        <p>N</p>
+      </div>
+      <div class="cl"></div>
     </div>
   </div>
 </div>

app/views/poll/_poll.html.erb

@@ -1,20 +1,19 @@
 <% has_commit = has_commit_poll?(poll.id ,User.current)%>
+<% poll_name = poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
 <li title="<%= poll.polls_name %>">
   <% if @is_teacher %>
       <% if has_commit %>
           <sapn class="polls_title fl">
-            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name%>
+            <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
           </sapn>
       <% else %>
-          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl" %>
       <% end %>
   <% else %>
       <% if has_commit && poll.polls_status == 2 %>
-          <sapn class="polls_title fl" style="max-width: 500px;">
-            <%= poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name %>
-          </sapn>
+          <%= link_to poll_name, poll_result_poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 500px;width: auto;" %>
       <% elsif !has_commit && poll.polls_status == 2 %>
-          <%= link_to (poll.polls_name.empty? ? l(:label_poll_new) : poll.polls_name), poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
+          <%= link_to poll_name, poll_path(poll.id), :class => "polls_title polls_title_w fl", :style => "max-width: 550px;width: 550px;" %>
       <% end %>
   <% end %>
 </li>

app/views/poll/_show_MCQ_result.html.erb

@@ -0,0 +1,26 @@
+<li  class="ur_question_item checkbox">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[多选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table">
+      <tbody>
+      <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
+          <tr>
+            <td>
+              <%= answer.poll_answer.answer_text  %>
+            </td>
+          </tr>
+      <% end%>
+      </tbody>
+    </table>
+  </div>
+</li><!--多选题 end-->

app/views/poll/_show_MC_result.html.erb

@@ -0,0 +1,27 @@
+<li class="ur_question_item radio">
+  <div class="ur_title">
+    <span class="title_index">
+      第<%= poll_question.question_number%>题：
+    </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单选题]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <table class="ur_table" >
+      <tbody>
+      <% poll_question.poll_votes.where("user_id = #{User.current.id}").each do |answer|%>
+          <tr>
+            <td>
+              <%= answer.poll_answer.answer_text  %>
+            </td>
+          </tr>
+      <% end%>
+
+      </tbody>
+    </table>
+  </div>
+</li><!--单选题 end-->

app/views/poll/_show_mulit_result.html.erb

@@ -0,0 +1,20 @@
+<li class="ur_question_item textarea">
+  <div class="ur_preview">
+    <div class="ur_title">
+      <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+      <%= poll_question.question_title %>
+      <span class="title_index">[多行主观]</span>
+      <%if poll_question.is_necessary == 1%>
+          <span class="ur_required" title="必答">*</span>
+      <%end%>
+    </div>
+    <div class="cl"></div>
+    <div class="ur_inputs">
+      <p>
+        <%= get_anwser_vote_text poll_question.id,User.current.id%>
+      </p>
+    </div>
+  </div>
+</li><!--多行输入 end-->

app/views/poll/_show_single_result.html.erb

@@ -0,0 +1,18 @@
+<li  class="ur_question_item text">
+  <div class="ur_title">
+    <span class="title_index">
+        第<%= poll_question.question_number%>题：
+      </span>
+    <%= poll_question.question_title %>
+    <span class="title_index">[单行主观]</span>
+    <%if poll_question.is_necessary == 1%>
+        <span class="ur_required" title="必答">*</span>
+    <%end%>
+  </div>
+  <div class="cl"></div>
+  <div class="ur_inputs">
+    <p>
+      <%= get_anwser_vote_text poll_question.id,User.current.id%>
+    </p>
+  </div>
+</li><!--当行输入 end-->

app/views/poll/poll_result.html.erb

@@ -0,0 +1,36 @@
+<%= stylesheet_link_tag  'polls', :media => 'all' %>
+<div class="polls_content polls_box">
+  <div class="ur_page_head" >
+    <h1 class="ur_page_title">
+      <%= @poll.polls_name.empty? ? l(:label_poll_new) : @poll.polls_name %>
+    </h1>
+    <p class="ur_prefix_content">
+      <%= @poll.polls_description%>
+    </p>
+  </div>
+  <div class="ur_card">
+    <ol class="ur_questions">
+      <% @poll_questions.each do |poll_question|%>
+          <% if poll_question.question_type == 1%>
+              <%= render :partial => 'show_MC_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 2%>
+              <%= render :partial => 'show_MCQ_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 3%>
+              <%= render :partial => 'show_single_result', :locals => {:poll_question => poll_question} %>
+          <% elsif poll_question.question_type == 4%>
+              <%= render :partial => 'show_mulit_result', :locals => {:poll_question => poll_question} %>
+          <% end%>
+      <% end%>
+    </ol>
+  </div> <!--ur_cards end-->
+  <div class="cl"></div>
+
+  <!-- 分页 -->
+  <div class="polls_content" id="polls">
+      <ul class="wlist">
+        <%= pagination_links_full @obj_pages, @obj_count, :per_page_links => false, :remote => false, :flag => true%>
+      </ul>
+      <div class="cl"></div>
+  </div>
+</div><!--问卷内容end-->
+

app/views/projects/_join_project.html.erb

@@ -0,0 +1,83 @@
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
+<html xmlns="http://www.w3.org/1999/xhtml">
+<head>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
+  <title>快速进入项目通道</title>
+  <style>
+      #popbox{ font-size:12px; font-family:"微软雅黑","宋体"; line-height:1.9; background:#fff; font-style:normal;}
+      #popbox div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margin:0; padding:0;}
+      #popbox div,img,tr,td{ border:0;}
+      #popbox table,tr,td{border:0; cellspacing:0; cellpadding:0;}
+      #popbox ul,li{ list-style-type:none}
+      #popbox .cl{ clear:both; overflow:hidden; }
+      #popbox a{ text-decoration:none; }
+      #popbox a:hover{ }
+
+      .alert_box {width:400px;height:200px;position:fixed;z-index:1002;left:50%;top:40%;margin:-215px 0 0 -300px;  background:#fff; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; box-shadow:0px 0px 8px #194a81; padding:5px; overflow:auto; }
+      #popbox{width:400px;height:200px;}
+      .alert .C{width:388px;height:200px;position:absolute;left:5px;top:5px;  }
+      .C_top{ margin-top:20px; width:368px; height:100px; background:#e9e9e9; padding:0px 60px  !important;  }
+      .C_top h2{ color:#1c1d1d; font-size:24px; font-style:normal; font-weight:normal;}
+      .C_top p{ color:#a9aaaa; line-height:22px;}
+      .C_form{ margin:20px 0 0 60px;}
+      .C_form ul li{ font-size:14px; color:#3f3a39; line-height:30px; padding-left: 60px;}
+      .C_form ul li input{ margin-left:20px; border:0px; border:1px solid #e1e1e1; color:#898989; padding-left:5px; -moz-border-radius:5px;  -webkit-border-radius:5px;  border-radius:5px; padding: 0 !important; }
+      .C_form ul li.mB5{ color:#898989; font-size:12px; padding-left:150px;}
+      .width190{ width:190px; height:26px; border-color:#e1e1e1;}
+      .C_form a{ font-size:12px; color:#15bccf; float:left; display:block; height:40px; width:200px;  margin-top:25px;}
+      .C_form a:hover{ text-decoration:underline;}
+      .C_form a.btn{ display:block; width:100px; height:36px; padding-top:4px; text-align: center; background:#15bccf; color:#fff; font-size:14px; margin:20px 20px 0 95px;}
+      .C_form a.btn:hover{ background:#ff821d;}
+  </style>
+  <script type="text/javascript">
+      function submit_form(obj)
+      {
+          hideModal(obj);
+          $("#new-watcher-form").submit();
+          alert("申请成功");
+      }
+
+      function hidden_join_course_form()
+      {
+          hideModal($("#popbox"));
+      }
+  </script>
+</head>
+
+<body>
+<div id="popbox">
+  <div class="C"  >
+    <div class="C_top">
+      <h2>快速进入项目通道</h2>
+      <p>只要持有项目的ID，就可快速申请加入所在项目。项目页面搜索不到的私有项目只能从此通道进入哦！</p>
+    </div>
+    <div class="C_form">
+      <%= form_tag({:controller => 'applied_project',
+                    :action => 'applied_join_project'},
+                   :remote => true,
+                   :method => :post,
+                   :id => 'new-watcher-form') do %>
+          <ul>
+            <li style="padding-top: 15px;">
+              <span class="tips">项&nbsp;目&nbsp;ID：</span>
+              <input type="hidden" name="user_id" value="<%= User.current.id%>">
+              <input class=" width190" name="project_id" id="project_id" type="text" value="" >
+              <input type="text" style="display: none"/>
+            </li>
+            <li class="mB5">项目ID是所在项目网址中显示的序号</li>
+            <li>
+              <a href="#" class="btn" style="margin-left: 50px;" onclick="submit_form(this);">
+                <%= l(:label_new_join)  %>
+              </a>
+              <a href="#" class="btn" style="margin-left: 20px;" onclick="hideModal(this);">
+                <%= l(:button_cancel)%>
+              </a>
+            </li>
+          </ul>
+      <% end%>
+    </div>
+  </div><!---- C end---->
+</div>
+</body>
+</html>
+

app/views/projects/join_project.js.erb

@@ -0,0 +1,9 @@
+$('#ajax-modal').html('<%= escape_javascript(render :partial => 'projects/join_project') %>');
+showModal('ajax-modal', '510px');
+$('#ajax-modal').css('height','260px');
+$('#ajax-modal').siblings().remove();
+$('#ajax-modal').before("<span style='float: right;cursor:pointer;padding-left: 513px;'>" +
+        "<a href='#' onclick='hidden_join_course_form();'><img src='/images/bid/close.png' width='26px' height='26px' /></a></span>");
+$('#ajax-modal').parent().removeClass("alert_praise");
+$('#ajax-modal').parent().css("top","").css("left","");
+$('#ajax-modal').parent().addClass("alert_box");

app/views/welcome/index.html.erb

@@ -66,6 +66,9 @@
                                             :course => 0,
                                             :project_type =>( @project_type||=0)},
                     :class => 'icon icon-add') if User.current.allowed_to?(:add_project, nil, :global => true) %>
+              
+          <%= link_to l(:label_join_project), join_project_projects_path ,:remote => true, :class => 'icon icon-add' %>
+          &nbsp;&nbsp;&nbsp;&nbsp;
       <% end %>
     </span>
 	<div class="d-p-projectlist-box">

config/locales/zh.yml

@@ -2282,4 +2282,5 @@ zh:
   label_answer: 答案：
   label_poll_answer_valid_result: 以上为有效问答题答案！
   label_answer_total: 总计：
+  label_join_project: 加入项目
 

config/routes.rb

@@ -66,6 +66,7 @@ RedmineApp::Application.routes.draw do
       post 'commit_poll'
       get 'publish_poll'
       get 'republish_poll'
+      get 'poll_result'
     end
     collection do
       delete 'delete_poll_question'
@@ -376,6 +377,10 @@ RedmineApp::Application.routes.draw do
       match 'copy', :via => [:get, :post]
     end
 
+    collection do
+      match 'join_project', :via => [:get, :post]
+    end
+
     #by young
     match '/member', :to => 'projects#member',  :as => 'member', :via => :get
     match '/file', :to => 'projects#file',  :as => 'file', :via => :get

public/stylesheets/polls.css

@@ -14,9 +14,9 @@ div,html,img,ul,li,p,body,h1,h2,h3,h4,p,a,table,tr,td,fieldset,input,span{ margi
 #polls .fr{ float:right;}
 
 /*问卷按钮*/
-.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; }
-.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}
-.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}
+/*.polls_btn{ height:33px;border-top:1px solid #15bed1; border-bottom:1px solid #15bed1;border-right:1px solid #cee6e6; width:225px; padding:7px 0 0 15px; }*/
+/*.polls_btn a{font-size:14px; color:#444444;font-weight:bold;}*/
+/*.polls_btn span{ color:#15bed1; font-size:12px; font-weight:normal;}*/
 
 /*问卷列表*/
 .polls_content{ width:615px;padding-left: 6px;}