Merge branch 'develop' of https://bdgit.trustie.net/hushasha/bigdata into develop

2017-07-14 17:16:45 +08:00 · 2017-07-14 17:16:45 +08:00 · cfb08b18a6
parent e3a7907bf8 a513ad0b5a
commit cfb08b18a6
14 changed files with 52 additions and 15 deletions
--- a/app/controllers/account_controller.rb
+++ b/app/controllers/account_controller.rb
@ -453,7 +453,7 @@ class AccountController < ApplicationController
  end

  def apply_trail
-    apply_action = ApplyAction.where(:user_id => User.current.id,  :container_type => "TrialAuthorization").first
+    apply_action = ApplyAction.where(:user_id => User.current.id,  :container_type => "TrialAuthorization", :status => 0).first
    if apply_action.blank?
      ApplyAction.create(:user_id => User.current.id, :status => 0, :container_type => "TrialAuthorization")
    end
--- a/app/controllers/managements_controller.rb
+++ b/app/controllers/managements_controller.rb
@ -292,6 +292,12 @@ class ManagementsController < ApplicationController
    apply_action.update_attributes(:status => (params[:type] == "1" ? 2 : 1), :reason => params[:reject_reason], :dealer_id => User.current.id)
    user_id = User.find_by_sql("select id from users where concat(lastname,firstname) like '%#{search}%'")
    @authorizations = ApplyAction.where(:container_type => "TrialAuthorization", :status => 0, :user_id => user_id).includes(:user)
+    @autu_count = @authorizations.count
+    @limit = 15
+    @is_remote = true
+    @autu_pages = Paginator.new @autu_count, @limit, params['page'] || 1
+    @offset ||= @autu_pages.offset
+    @authorizations = paginateHelper @authorizations, @limit
    respond_to do |format|
      format.js
    end
--- a/app/controllers/users_controller.rb
+++ b/app/controllers/users_controller.rb
@ -1235,7 +1235,7 @@ class UsersController < ApplicationController
  #导入作业，确定按钮
  def user_select_homework
    params[:checkMenu].each do |homework_bank|
-      homework = HomeworkBank.find_by_id params[:checkMenu]
+      homework = HomeworkBank.find_by_id homework_bank
      @select_course = Course.find params[:select_course]
      if homework && @select_course
        quote_homework_bank homework, @select_course
--- a/app/views/account/apply_trail.js.erb
+++ b/app/views/account/apply_trail.js.erb
@ -1 +1 @@
-$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => "申请成功，我们将在一个工作日内完成审核", :url => "javascript:void(0);"}) %>');
+$("body").append('<%= j( render :partial => 'welcome/one_btn_mask_pop', :locals => {:btn => "确定", :tip1 => "申请成功，我们将在一个工作日内完成审核", :url => "#{my_account_path()}"}) %>');
--- a/app/views/homework_common/index.html.erb
+++ b/app/views/homework_common/index.html.erb
@ -4,8 +4,8 @@
      <p class="ml15 color-grey fl">作业列表</p>
      <% if @is_teacher %>
          <a href="javascript:void(0);" onclick="alert_choose_homework_type('<%= @course.id %>');" class="task-btn task-btn-blue fr mr20">新建</a>
+          <%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
      <% end %>
-      <%= link_to("题库选用", user_import_homeworks_user_path(User.current.id, :select_course => @course.id), :class => "edu-btn fr mr10",:remote => true,:title=>"导入自己发布过的作业，或者共享题库中的作业") %>
      <!--<a href="<%#= export_course_member_excel_course_path(@course) %>" class="edu-btn fr mr10">导出成绩</a>-->
    </div>
    <div class="edu-class-innner-conbox">
--- a/app/views/shixuns/_form.html.erb
+++ b/app/views/shixuns/_form.html.erb
@ -42,7 +42,7 @@
            <li class="clearfix mb15 pr">
              <label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用课程&nbsp;&nbsp;&nbsp;</label>
              <div id="shixun[lesson]" class="fl task-form-28 task-height-40 lesson pr">
-                <input type="text" class="lesson_content" placeholder="选择实训适用的课程">
+                <input type="text" class="lesson_content" readonly placeholder="选择实训适用的课程">
                <i class="fa fa-sort-desc lesson_img"></i>
                <ul class="lesson_checkbox" showul="0">
                </ul>
@ -171,6 +171,10 @@

  };
    $(function(){
+        // 防止刷新页面后适用课程的下拉列表为空
+        $("#shixun_major").val("0");
+        $(".lesson_content").val("");
+
        //多选适用课程
        $("body").click(function(event){
            $(".lesson_checkbox").hide();
--- a/app/views/shixuns/_settings_edit.html.erb
+++ b/app/views/shixuns/_settings_edit.html.erb
@ -27,7 +27,7 @@
        <li class="clearfix pr">
          <label class="panel-form-label fl"><span class="color-orange mr5">*</span>适用课程&nbsp;&nbsp;&nbsp;</label>
          <div id="shixun[lesson]" class="fl task-form-28 task-height-40 lesson pr">
-            <input type="text" class="lesson_content" placeholder="选择实训适用的课程">
+            <input type="text" class="lesson_content" readonly placeholder="选择实训适用的课程">
            <i class="fa fa-sort-desc lesson_img"></i>
            <ul class="lesson_checkbox" showul="0">
            </ul>
--- a/app/views/subjects/_subject_list.html.erb
+++ b/app/views/subjects/_subject_list.html.erb
@ -14,7 +14,7 @@
      </div>
  <% else %>
      <% @subjects.each do |subject| %>
-        <div class="sub-con fl" style="cursor: default;">
+        <div class="sub-con fl pr" style="cursor: default;">
          <% if subject.status < 2 && !User.current.manager_of_subject?(subject) %>
              <div class="black-half">
                <div class="black-half-lock"><i class="fa fa-lock" style="font-size: 50px"></i></div>
@ -61,4 +61,19 @@
        </div>
      <% end %>
  <% end %>
-</div>
+</div>
+
+<script>
+    var timer="";
+    $(".sub-con").hover(function(ev){
+        this.fn = function(){
+            $(this).find(".black-half").show();
+        }
+        clearTimeout(timer);
+        var item=$(this);
+        timer=setTimeout(this.fn(),500);
+    },function(){
+        clearTimeout(timer);
+        $(this).find(".black-half").hide();
+    })
+</script>
--- a/app/views/syllabuses/_syllabus_des.html.erb
+++ b/app/views/syllabuses/_syllabus_des.html.erb
@ -1,4 +1,4 @@
-<div class="edu-tab-con-box" id="sy_des_show_div">
+<div class="edu-sy-con-box" id="sy_des_show_div">
  <% if @syllabus.des_status == 1 %>
      <% if @is_syllabus_admin %>
          <a href="javascript:void(0);" id="edit_sy_des" class="link-color-grey fr font-16" title="编辑"><i class="fa fa-edit "></i></a>
@ -13,7 +13,7 @@
        还没有<% if @is_syllabus_admin %><a href="javascript:void(0)" id="edit_sy_des_add" class="link-color-blue">添加</a><% else %>添加<% end %>授课大纲 ~ </p>
  <% end %>
 </div>
-<div class="edu-tab-con-box undis" id="sy_des_edit_div">
+<div class="edu-sy-con-box undis" id="sy_des_edit_div">
  <a href="javascript:void(0)" id="save_sy_des" class="link-color-grey fr font-16" title="保存"><i class="fa fa-floppy-o "></i></a>
  <a href="javascript:void(0)" id="cancel_edit_sy_des" class="link-color-grey fr font-16" title="取消"><i class="fa fa-undo mr15"></i></a>
  <%= labelled_form_for @syllabus, :url =>update_des_syllabus_path(@syllabus),
--- a/app/views/syllabuses/_syllabus_homeworks.html.erb
+++ b/app/views/syllabuses/_syllabus_homeworks.html.erb
@ -1,4 +1,4 @@
-<div class="edu-tab-con-box">
+<div class="edu-sy-con-box">
  <% if @homework_count == 0 %>
      <img src="../images/bigdata/edu-class/edu-nodata.png" width="200" height="" class="edu-nodata-img">
      <p class="edu-nodata-p mb30">还没有添加课程题库 ~ </p>
--- a/app/views/syllabuses/_syllabus_members.html.erb
+++ b/app/views/syllabuses/_syllabus_members.html.erb
@ -1,5 +1,5 @@
-<% @members.each do |member| %>
-    <div class="clearfix mb20">
+<% @members.each_with_index do |member, index| %>
+    <div class="sy_member_div clearfix mb20 <%= index > 9 ? 'none' : '' %>">
      <% user = member.user %>
      <%= link_to image_tag(url_to_avatar(user), :width => "100", :height => "100", :alt => "头像"), user_path(user), :target => '_blank', :class => "fl edu-class-user-img ml15 mr15" %>
      <ul class="fl mr15">
@ -25,4 +25,10 @@
        </li>
      </ul>
    </div>
+    <% if index == 10 %>
+        <a href="javascript:void(0);" onclick="show_all_members(this)" class="edu-class-right-add color-light-green" style="background:#fff; border-top:1px solid #eee; position: inherit;">
+          <i class="fa fa-angle-down"></i>
+          <span>查看全部</span>
+        </a>
+    <% end %>
 <% end %>
--- a/app/views/syllabuses/_syllabus_resources.html.erb
+++ b/app/views/syllabuses/_syllabus_resources.html.erb
@ -1,4 +1,4 @@
-<div class="edu-tab-con-box">
+<div class="edu-sy-con-box">
  <% if @resource_count == 0 %>
      <img src="../images/bigdata/edu-class/edu-nodata.png" width="200" height="" class="edu-nodata-img">
      <p class="edu-nodata-p mb30">还没有添加课程资源库 ~ </p>
--- a/app/views/syllabuses/show.html.erb
+++ b/app/views/syllabuses/show.html.erb
@ -106,7 +106,7 @@
        </div>
      </div>
    </div>
-    <div class="edu-h300-auto " id="syllabus_members_box">
+    <div class="" id="syllabus_members_box">
      <%= render :partial => "syllabus_members" %>
    </div>

@ -193,5 +193,10 @@
        });
        autoUrl('syllabus_description_<%= @syllabus.id %>');
    });
+
+    function show_all_members(ele){
+        $(".sy_member_div").show();
+        $(ele).hide();
+    }
 </script>

--- a/public/stylesheets/css/edu-class.css
+++ b/public/stylesheets/css/edu-class.css
@ -85,6 +85,7 @@ table.table-pa5 th,table.table-pa5 td{ padding:0 5px;}
 .undis {display:none;}
 .dis {display:block;}
 .edu-tab-con-box{ padding:15px; max-height:1200px; overflow: auto; color:#666; line-height: 2.0; background:#fff;}
+.edu-sy-con-box{ padding:15px; color:#666; line-height: 2.0; background:#fff;}
 .edu-class-right-box{ background:#fff;  position:relative; padding-bottom:20px;}
 a.edu-class-user-img{ height: 80px;}
 .edu-class-user-img img{ width: 80px; height: 80px; border-radius:100px;}