Merge branch 'educoder' into develop

app/controllers/application_controller.rb

@@ -65,6 +65,15 @@ class ApplicationController < ActionController::Base
   include Redmine::MenuManager::MenuController
   helper Redmine::MenuManager::MenuHelper
 
+  def ecloud_auth ucloud_user_id
+    euser = EcloudUser.where("id =? and opttype not in(3, 5)", ucloud_user_id).first
+    if euser.present?  # 开通过业务
+      #
+    else
+      false
+    end
+  end
+
   def ec_public_auth major_school
     unless User.current.admin? || major_school.template_major || major_school.school.users.where(:id => User.current.id).count > 0 ||
         major_school.ec_major_school_users.where(:user_id => User.current.id).count > 0 ||

app/controllers/ecloud_controller.rb

@@ -59,10 +59,14 @@ class EcloudController < ApplicationController
           create_product_params(params['productparas'],  ecloud.try(:id)) if params['productparas'].present?
           # 为管理员添加一条记录
           # 开通的时候都是用户的opttype也是0
-          EcloudUser.create!(custid: params['custid'], opttype: params['opttype'], userid: params['userid'],
+          # 如果管理员已经存在，则不用重复开通
-                             username: params['username'], useralias: params['useralias'],
+          euser = EcloudUser.where(id: params['userid'], custid: params['custid']).first
-                             mobile: params['mobile'],  email: params['email'],  begintime: params['begintime'],
+          unless euser
-                             endtime: params['endtime'])
+            EcloudUser.create!(custid: params['custid'], opttype: params['opttype'], userid: params['userid'],
+                               username: params['username'], useralias: params['useralias'],
+                               mobile: params['mobile'], email: params['email'],  begintime: params['begintime'],
+                               endtime: params['endtime'])
+          end
         elsif params['opttype'] == 2 # 试用转商用 # 变更企业/个人业务
           # 业务列表：注销业务(注销试用的套餐)，另一个业务项的操作代码是：新增业务(开通商用的套餐)
           # 需要通过产品服务编号和业务编码来区分哪个产品

app/models/ecloud_users.rb

@@ -1,3 +1,4 @@
 class EcloudUser < ActiveRecord::Base
+  # opttype:  # user['opttype']: 操作类型0：开通；1：变更；3: 取消授权；4：暂停；5：恢复；
   attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
 end

app/views/subjects/_new_shixun_list.html.erb

@@ -25,8 +25,10 @@
 <% else %>
   <div style="text-align: center;padding: 100px 0px;">
     <p class="font-16 mb20">没有实训数据可以选择</p>
-    <p>
+    <a href="javascript:void(0)" onclick="newshixuns(<%= User.current.mail.blank? %>)" class = "white-btn orange-btn">立即新建</a>
-      <a href="javascript:void(0)" onclick="newshixuns(<%= User.current.mail.blank? %>)" class = "white-btn orange-btn">立即新建</a>
+    <div class="clearfix edu-txt-center">
+      <a href="javascript:void(0);" class="task-btn pop_close mr60 pathhidnmodel" onclick="hideModal();">取消</a>
+    </div>
   </div>
 <% end %>
 

db/migrate/20190314080805_create_shixun_student_works.rb

@@ -1,3 +1,4 @@
+# encoding: utf-8
 class CreateShixunStudentWorks < ActiveRecord::Migration
   DCODES = %W(2 3 4 5 6 7 8 9 a b c f e f g h i j k l m n o p q r s t u v w x y z)
 
@@ -13,16 +14,16 @@ class CreateShixunStudentWorks < ActiveRecord::Migration
   end
 
   def up
-    ActiveRecord::Base.transaction do
+    works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
-      begin
+    works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
-        works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and (work_score is null or work_score = 0)")
+                     :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
-        works.update_all(:myshixun_id => 0, :work_status => 0, :work_score => nil, :final_score => nil,
-                         :cost_time => 0, :update_time => nil, :compelete_status => 0, :commit_time => nil)
 
-        shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
+    shixun_works = StudentWork.where("myshixun_id != 0 and myshixun_id not in (select id from myshixuns) and work_score > 0")
-        shixun_works.each do |work|
+    shixun_works.each do |work|
-          shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
+      shixun = work.homework_common.try(:homework_commons_shixuns).try(:shixun)
-          user = work.user
+      user = work.user
+      begin
+        ActiveRecord::Base.transaction do
           if shixun.present? && user.present?
             # 创建新的myshixun和games
             # fork版本库，如果用户没有同步，则先同步用户

public/stylesheets/educoder/edu-main.css

@@ -859,4 +859,10 @@ html>body #ajax-indicator { position: fixed; }
 .ListTablecheckbox{
     left: 42px;
     top: -1px !important;
-}
+}
+
+.pathhidnmodel{
+    position: absolute;
+    margin-top: 60px;
+    margin-left: -26px;
+}