Merge branch 'educoder' into develop

app/controllers/managements_controller.rb

@@ -3,7 +3,7 @@ class ManagementsController < ApplicationController
   before_filter :require_business
   before_filter :require_admin, :only => [:shixun_setting_list, :mirror_repository, :mirror_picture_shixuns, :editmd_template,
                                           :editmd_template, :subject_level_system, :subject_setting_list,
-                                          :shixun_authorization, :ec_template, :codemirror_template,
+                                          :shixun_authorization, :ec_template, :codemirror_template, :update_user,
                                           :course_guide_template, :shixun_quality_score, :tech_system, :update_notice, :setting_banner,
                                           :training_2018, :create_standard]
   layout 'base_management'

app/controllers/welcome_controller.rb

@@ -42,7 +42,7 @@ class WelcomeController < ApplicationController
 
   # 运营引流个人数据展示
   def user_agents
-    @user_agents = UserAgent.where(key: params[:edu]).includes(:user_actionss)
+    @user_agents = UserAgent.where(key: params[:edu])
     @agents_count = @user_agents.count
     limit = 20
     @agents_pages = Paginator.new @agents_count, limit, params['page'] || 1

app/helpers/welcome_helper.rb

@@ -24,22 +24,41 @@ module WelcomeHelper
 
   # 引流注册情况
   def register_info user_agent
-    if user_agent.agent_type.to_i == UserAgent::USER_AD
-      user_id = user_agent.user_actionss.first.try(:user_id)
-      if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present?
-        "代理前注册"
-      else
-        "未转换"
+    case user_agent.register_status
+    when 0
+      "改IP未登录"
+    when 1
+      "代理之前注册"
+    when 2
+      "代理之后注册"
     end
-    elsif user_agent.agent_type.to_i == UserAgent::USER_REGISTER || UserActions.find_by_ip(user_agent.ip)
-      "代理后注册"
-    else
-      user_id = user_agent.user_actionss.first.try(:user_id)
-      if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present?
-        "代理前注册"
-      else
-        "代理后注册"
+    # if user_agent.agent_type.to_i == UserAgent::USER_AD
+    #   user_id = user_agent.user_actionss.first.try(:user_id)
+    #   if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present?
+    #     "代理前注册"
+    #   else
+    #     "未转换"
+    #   end
+    # elsif user_agent.agent_type.to_i == UserAgent::USER_REGISTER || UserActions.find_by_ip(user_agent.ip)
+    #   "代理后注册"
+    # else
+    #   user_id = user_agent.user_actionss.first.try(:user_id)
+    #   if user_id && User.where("id = #{user_id} and created_on < '2019-07-15 00:00:00'").present?
+    #     "代理前注册"
+    #   else
+    #     "代理后注册"
+    #   end
+    # end
   end
+
+  def competion_info user_agent
+    case user_agent.action_status
+    when 0
+      "未报名"
+    when 1
+      "代理之前报名"
+    when 2
+      "代理之后报名"
     end
   end
 

app/models/user_agent.rb

@@ -1,3 +1,5 @@
+# register_status: 0：未注册；1: 代理之前注册；2：代理之后注册
+# action_status: 0：未注册；1: 代理之前报名；2：代理之后报名
 class UserAgent < ActiveRecord::Base
   has_many :user_actionss, :foreign_key => "ip", :primary_key => "ip"
   USER_AD = 1  # 广告宣传的引流

app/services/sources_service.rb

@@ -171,7 +171,8 @@ class SourcesService
 
   def get_user_info params
     user = User.find params[:id]
-    {username: user.show_real_name, user_id: user.id, email: user.mail, phone: user.phone, sex: user.sex, school_name: user.school_name}
+    mail = user.mail.presence || "login@educoder.net"
+    {username: user.show_real_name, user_id: user.id, email: mail, phone: user.phone, sex: user.sex, school_name: user.school_name}
   end
 
   # courses start ############################################

app/views/layouts/_footer.html.erb

@@ -1,10 +1,6 @@
 <div class="newFooter edu-txt-center">    <!-- 底部导航栏 -->
   <div class="inner-footer_con">
     <div class="footercon">
-      <div class="inline mt40">
-        <%= link_to image_tag("/images/educoder/headNavLogo.png", alt:"高校智能化教学与实训平台" , width: "70px"), home_path,:class => "fl",:style => "height:70px" %>
-        <span class="fl color-grey-c cdefault font-28 ml30" style="line-height:74px">EduCoder.NET</span>
-      </div>
       <ul class="clearfix inner-footernav">
         <li><a href="<%= home_path %>" class="fl">网站首页</a></li>
         <li><a href="<%= help_path(:index => 1) %>" class="fl">关于我们</a></li>

app/views/layouts/_unlogin_header.html.erb

@@ -51,9 +51,10 @@
   </div>
 
   <span class="font-15 fr mt15 ml15">
-      <%= link_to '登录', signin_path, :class => "mr5 color-white" %>
+      <a href="www.educoder.net/login" class="mr5 color-white">登录</a>
     <em class="vertical-line"></em>
-    <%= link_to '注册', user_join_path, :class => "ml5 color-white" %>
+    <a href="www.educoder.net/register" class="mr5 color-white">登录</a>
+    <%#= link_to '注册', user_join_path, :class => "ml5 color-white" %>
     </span>
   <div class="fr head-right">
     <a href="javascript:void(0)" id="search-open" class="fl headIcon">
@@ -65,7 +66,6 @@
       <div class="edu-menu-list" style="top:60px;width: 240px;">
         <div class="overPart"></div>
         <ul class="fl with50 edu-txt-center pr ul-leftline">
-          <li><%= link_to '新建课堂', new_course_path() %></li>
           <li><%= link_to '新建实训', new_shixun_path() %></li>
           <li><%= link_to '新建实践课程', new_subject_path() %></li>
           <li><%= link_to '新建项目', new_project_path() %></li>

app/views/welcome/_user_agent_list.html.erb

@@ -15,7 +15,7 @@
       <td class="edu-txt-left"><span><%= link_to ua.key, user_path(ua.key), :target => "_blank" %></span></td>
       <td><%= link_to user.try(:show_real_name), user_path(user), target:'_blank' %></td>
       <td><%= register_info(ua) %></td>
-      <td><%= ua.agent_type.to_i == UserAgent::USER_COMPETITION ? "已报名" : "未报名" %></td>
+      <td><%= competion_info(ua) %></td>
       <td><%= ua.ip %></td>
     </tr>
   <% end %>

db/migrate/20190723024514_add_register_status_to_user_agents.rb

@@ -0,0 +1,6 @@
+class AddRegisterStatusToUserAgents < ActiveRecord::Migration
+  def change
+    add_column :user_agents, :register_status, :integer, :default => 0
+    add_column :user_agents, :action_status, :integer, :default => 0
+  end
+end

lib/tasks/user_agent.rake

@@ -0,0 +1,37 @@
+# register_status: 0：未注册；1: 代理之前注册；2：代理之后注册
+# register_action: 0：未报名；1: 代理之前报名；2：代理之后报名
+desc "sync user_agents"
+namespace :sync do
+  task :user_agent => :environment do
+    UserAgent.find_each do |ua|
+      puts ua.id
+      user_action = UserActions.find_by_ip(ua.ip)
+      params = {}
+      # 用户注册情况
+      if user_action
+        user = User.find(user_action.try(:user_id))
+
+        # 即代理之前注册
+        if user.created_on < ua.created_at
+          params = params.merge(:register_status => 1)
+        else
+          # 代理之后注册的
+          params = params.merge(:register_status => 2)
+        end
+      end
+
+      # 用户报名情况
+      team_member = TeamMember.find_by_user_id(user_action.try(:user_id))
+      if team_member
+        # 即代理之前报名的
+        if team_member.created_on < ua.created_at
+          params = params.merge(:action_status => 1)
+        else
+          # 代理之后报名的
+          params = params.merge(:action_status => 2)
+        end
+      end
+      ua.update_attributes(params)
+    end
+  end
+end