From e7298c7d6fbcef726701438c189866d03c3bacf9 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Mar 2019 14:02:43 +0800
Subject: [PATCH 1/7] ecloud

---
 app/controllers/ecloud_controller.rb                      | 6 +++---
 db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb | 5 +++++
 2 files changed, 8 insertions(+), 3 deletions(-)
 create mode 100644 db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb

diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index ebbd8c1c..33463358 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -102,10 +102,10 @@ class EcloudController < ApplicationController
     begin
       ecloud = Ecloud.where(applyno: params['applyno']).first
       user_param = params['users'].first
-      ecloud_user = ecloud.ecloud_user
+      ecloud_user = EcloudUser.where(ecloud_id: ecloud.id).first
 
-        ecloud_user.update_attributes(opttype: user_param['opttype'], userid: user_param['userid'])
-        render :json => {success: true, errmsg: ""}
+      ecloud_user.update_attributes(opttype: user_param['opttype'], userid: user_param['userid'])
+      render :json => {success: true, errmsg: ""}
       # else
       #   render :json => {code: 404, msg: "企业ID不存在"}
       # end
diff --git a/db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb b/db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb
new file mode 100644
index 00000000..f5ec4815
--- /dev/null
+++ b/db/migrate/20190313055953_add_ecloud_id_to_ecloud_user.rb
@@ -0,0 +1,5 @@
+class AddEcloudIdToEcloudUser < ActiveRecord::Migration
+  def change
+    add_column :ecloud_users, :ecloud_id, :integer
+  end
+end

From 7e168f42a6b4e0e7c85326155c1c451d2e793215 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Mar 2019 14:06:19 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E6=B5=8B=E8=AF=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ecloud_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index 05da090b..f5e97720 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -5,7 +5,7 @@ require 'digest'
 class EcloudController < ApplicationController
   skip_before_filter :verify_authenticity_token
 
-  before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
+  # before_filter :check_sign, only: [:ps_new, :ps_update, :bs_new, :bs_update]
 
   before_filter :user_setup
   # before_filter :require_login, only: [:authorize]

From fab470bc0a1edd8266fa299c3f249a01edf39298 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 13 Mar 2019 14:07:23 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_echart_of_shixun_skills.html.erb | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/app/views/student_work/_echart_of_shixun_skills.html.erb b/app/views/student_work/_echart_of_shixun_skills.html.erb
index 2902a5d4..a915a1e5 100644
--- a/app/views/student_work/_echart_of_shixun_skills.html.erb
+++ b/app/views/student_work/_echart_of_shixun_skills.html.erb
@@ -1,8 +1,8 @@
 <!--echarts_dev:开发板包含了常见的警告和错误提示，上线版：echarts.min.js -->
 <%= javascript_include_tag '/echart/echarts.min.js' %>
-<div class="fl" style="width: <%= params[:pdf] ? 750 : 810 %>px;height: 580px" id="shixun_skill_chart">
+<div class="fl" style="width: <%= params[:pdf] ? 750 : 820 %>px;height: 580px" id="shixun_skill_chart">
 </div>
-<div class="fl" style="width: <%= params[:pdf] ? 750 : 810 %>px;height: 580px" id="shixun_overall_ablility_chart">
+<div class="fl" style="width: <%= params[:pdf] ? 750 : 820 %>px;height: 580px" id="shixun_overall_ablility_chart">
 </div>
 <script type="text/javascript">
     console.log(<%= @power %>);

From c267b69fea863da3871f401c838b3d1f81528d03 Mon Sep 17 00:00:00 2001
From: daiao <35855898@qq.com>
Date: Wed, 13 Mar 2019 14:24:49 +0800
Subject: [PATCH 4/7] =?UTF-8?q?=E8=BF=81=E7=A7=BB=E5=AE=9E=E8=AE=AD?=
 =?UTF-8?q?=E9=80=9A=E5=85=B3=E5=90=8E=E6=B2=A1=E5=BE=97=E5=88=86=E7=9A=84?=
 =?UTF-8?q?=E8=AE=B0=E5=BD=95?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 ...20190313005345_add_score_for_pass_games.rb | 39 +++++++++++++++++++
 1 file changed, 39 insertions(+)
 create mode 100644 db/migrate/20190313005345_add_score_for_pass_games.rb

diff --git a/db/migrate/20190313005345_add_score_for_pass_games.rb b/db/migrate/20190313005345_add_score_for_pass_games.rb
new file mode 100644
index 00000000..0517993c
--- /dev/null
+++ b/db/migrate/20190313005345_add_score_for_pass_games.rb
@@ -0,0 +1,39 @@
+class AddScoreForPassGames < ActiveRecord::Migration
+  def up
+    games = Game.where("final_score = 0 and status = 2 and answer_open = 0 and end_time > '2019-03-08 00:00:00'").includes(:challenge)
+    puts "game_count: #{games.count}"
+    games.find_each do |game|
+      puts "#{game.id}"
+      challenge =  game.challenge
+      # 选择题和实践题的分数
+      score = challenge.choose_score
+      user = game.user
+      game.update_column(:final_score, score)
+      # 奖励金币和提供记录
+      grade = Grade.where(:user_id => user.id, :container_id => game.id, :container_type => "Game").first
+      if grade.nil?
+        Grade.create!(:user_id => user.id,
+                      :container_id => game.id,
+                      :container_type => "Game",
+                      :score => score,
+                      :created_at => game.end_time,
+                      :updated_at => game.end_time)
+        user.update_column(:grade, (score + user.grade.to_i))
+      end
+      # 经验奖励
+      experience = Experience.where(:user_id => user.id, :container_id => game.id, :container_type => "Game").first
+      if experience.nil?
+        Experience.create!(:user_id => user.id,
+                           :container_id => game.id,
+                           :container_type => "Game",
+                           :score => score,
+                           :created_at => game.end_time,
+                           :updated_at => game.end_time)
+        user.update_column(:experience, (score + user.experience.to_i))
+      end
+    end
+  end
+
+  def down
+  end
+end

From 66b12ec493e65afbb91565106886176bda3468d6 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Wed, 13 Mar 2019 14:30:28 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=AE=9E=E8=AE=AD=E6=8A=A5=E5=91=8A?=
 =?UTF-8?q?=E9=A1=B5=E9=9D=A2-=E5=9B=BE=E5=BD=A2=E7=BB=9F=E8=AE=A1?=
 =?UTF-8?q?=E9=A1=B5?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/views/student_work/_echart_of_shixun_skills.html.erb | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/app/views/student_work/_echart_of_shixun_skills.html.erb b/app/views/student_work/_echart_of_shixun_skills.html.erb
index a915a1e5..26f27099 100644
--- a/app/views/student_work/_echart_of_shixun_skills.html.erb
+++ b/app/views/student_work/_echart_of_shixun_skills.html.erb
@@ -1,8 +1,8 @@
 <!--echarts_dev:开发板包含了常见的警告和错误提示，上线版：echarts.min.js -->
 <%= javascript_include_tag '/echart/echarts.min.js' %>
-<div class="fl" style="width: <%= params[:pdf] ? 750 : 820 %>px;height: 580px" id="shixun_skill_chart">
+<div class="fl" style="width: <%= params[:pdf] ? 750 : 810 %>px;height: 580px" id="shixun_skill_chart">
 </div>
-<div class="fl" style="width: <%= params[:pdf] ? 750 : 820 %>px;height: 580px" id="shixun_overall_ablility_chart">
+<div class="fl" style="width: <%= params[:pdf] ? 750 : 810 %>px;height: 580px" id="shixun_overall_ablility_chart">
 </div>
 <script type="text/javascript">
     console.log(<%= @power %>);
@@ -12,7 +12,7 @@
     option = {
         grid: {
             left: '3%',
-            right: '7%',
+            right: '9%',
             bottom: '3%',
             containLabel: true
         },

From 5113d5cb3643108dfd705f36e6543a24db2cbfb6 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Mar 2019 14:31:54 +0800
Subject: [PATCH 6/7] =?UTF-8?q?ecloud=5Fuser=E6=B7=BB=E5=8A=A0status?=
 =?UTF-8?q?=E6=A0=87=E8=AE=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/controllers/ecloud_controller.rb               | 14 +++++++-------
 app/models/ecloud_user.rb                          |  2 +-
 .../20190313062414_add_status_to_ecloud_user.rb    |  5 +++++
 3 files changed, 13 insertions(+), 8 deletions(-)
 create mode 100644 db/migrate/20190313062414_add_status_to_ecloud_user.rb

diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index f5e97720..04d0050b 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -86,11 +86,11 @@ class EcloudController < ApplicationController
       # if ecloud_user.present?
       #   render :json => {code: 500, msg: "你已开通过该业务"}
       # else
-        EcloudUser.create!(custid: params['custid'], opttype: user_param['opttype'], userid: user_param['userid'],
-                           username: user_param['username'], useralias: user_param['useralias'],
-                           mobile: user_param['mobile'],  email: user_param['email'],  begintime: user_param['begintime'].to_s,
-                           endtime: user_param['endtime'].to_s)
-        render :json => {success: true, errmsg: ""}
+      EcloudUser.create!(custid: params['custid'], opttype: user_param['opttype'], userid: user_param['userid'],
+                         username: user_param['username'], useralias: user_param['useralias'],
+                         mobile: user_param['mobile'],  email: user_param['email'],  begintime: user_param['begintime'].to_s,
+                         endtime: user_param['endtime'].to_s, status: 1)
+      render :json => {success: true, errmsg: ""}
       # end
     rescue Exception => e
       logger.error(e.message)
@@ -103,9 +103,9 @@ class EcloudController < ApplicationController
     begin
       ecloud = Ecloud.where(applyno: params['applyno']).first
       user_param = params['users'].first
-      ecloud_user = EcloudUser.where(ecloud_id: ecloud.id).first
+      ecloud_user = EcloudUser.where(userid: user_param['userid'], status: 0).first
 
-      ecloud_user.update_attributes(opttype: user_param['opttype'], userid: user_param['userid'])
+      ecloud_user.update_attributes(opttype: user_param['opttype'], userid: user_param['userid'], status: 0)
       render :json => {success: true, errmsg: ""}
       # else
       #   render :json => {code: 404, msg: "企业ID不存在"}
diff --git a/app/models/ecloud_user.rb b/app/models/ecloud_user.rb
index 9266adb7..dd4a5584 100644
--- a/app/models/ecloud_user.rb
+++ b/app/models/ecloud_user.rb
@@ -1,3 +1,3 @@
 class EcloudUser < ActiveRecord::Base
-  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid
+  attr_accessible :begintime, :email, :endtime, :mobile, :opttype, :paras, :useralias, :userid, :username, :custid, :status, :ecloud_id
 end
diff --git a/db/migrate/20190313062414_add_status_to_ecloud_user.rb b/db/migrate/20190313062414_add_status_to_ecloud_user.rb
new file mode 100644
index 00000000..bedecfb3
--- /dev/null
+++ b/db/migrate/20190313062414_add_status_to_ecloud_user.rb
@@ -0,0 +1,5 @@
+class AddStatusToEcloudUser < ActiveRecord::Migration
+  def change
+    add_column :ecloud_users, :status, :integer, :limit => 1
+  end
+end

From f1a3459a830598893dc9f9003ff30236f8f49de2 Mon Sep 17 00:00:00 2001
From: huang <huang.jingquan@163.com>
Date: Wed, 13 Mar 2019 14:33:54 +0800
Subject: [PATCH 7/7] .

---
 app/controllers/ecloud_controller.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/controllers/ecloud_controller.rb b/app/controllers/ecloud_controller.rb
index 04d0050b..9af476cf 100644
--- a/app/controllers/ecloud_controller.rb
+++ b/app/controllers/ecloud_controller.rb
@@ -103,7 +103,7 @@ class EcloudController < ApplicationController
     begin
       ecloud = Ecloud.where(applyno: params['applyno']).first
       user_param = params['users'].first
-      ecloud_user = EcloudUser.where(userid: user_param['userid'], status: 0).first
+      ecloud_user = EcloudUser.where(userid: user_param['userid'], status: 1).first
 
       ecloud_user.update_attributes(opttype: user_param['opttype'], userid: user_param['userid'], status: 0)
       render :json => {success: true, errmsg: ""}