educode_sales 0.9.2 → 0.9.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f53f1760e66e10622abeeb7b8487804a5905e70b6adaec22df103fccd5e91bde
-  data.tar.gz: 5ba593e92ec3ec068cf850fcb4f5ff2ab61c47a0b3c93104649b0e38f96cc9b5
+  metadata.gz: d6a4ffe19355fdf757cb3714a1332b6159b0c3825f2b788cdc85c27a2ea35ce1
+  data.tar.gz: 31407d9b5ac98caff94bd770a06bf90c4b0326bd98a1813eb7e8405808b02d12
 SHA512:
-  metadata.gz: 3ae71fcb67e0946049f0cbe4f3b99dc1cbc6109042726beebfa78d1b59e7b4b00d3f84d261d1f9c3d8dfcd29d4a7b9d489827225d6d45e4c1678a85d80f702cd
-  data.tar.gz: a43d02fa863b87ae1df795af04f71080dda11153cc54c8cfeedcc43e10c2d5ab7104f598de8bdb1eb5983646ee6a6176be872b95ecc6f87973c54b602c1b7c94
+  metadata.gz: 3246c013b2e6a35a0fe3ed9c9fba8076000569c86e9df03b945e0a65918a25db265a63d730f1e0a9a4ccec56b9186ef9c464b8e7d6424cc71fcb7300ec941abc
+  data.tar.gz: 983547ec16762c558b4b5162c7c95b0cdb53530b58f74bf536a990e816954d7690539c5d033eca1baba5603939f214b34689dcfed9e5c518404d4ebf9f737b58

data/app/controllers/educode_sales/application_controller.rb

@@ -16,7 +16,9 @@ module EducodeSales
     end
 
     def authenticate_request
-      unless current_user
+      if current_user
+        current_user.check_login_status(request)
+      else
         redirect_to login_path
       end
     end

data/app/controllers/educode_sales/sale_trends_controller.rb

@@ -45,7 +45,7 @@ module EducodeSales
 
       count_type = params[:count_type] || "actual_amount"
       common = Common.find_by(clazz: 'staff_type', name: '销售')
-      names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id] }
+      names = Staff.includes(:user).where(job_type: common.id).map { |d| [d.user.real_name, d.id, d.role_id] }
       x_business_ids = []
       default_dates = (30.day.ago.to_date..Date.today).map { |d| d.strftime("%Y-%W") }.uniq #默认时间范围
       Business.all.each do |d|
@@ -249,6 +249,7 @@ module EducodeSales
         datasets: names.map.with_index do |name, i|
           {
             # hidden: i < 3 ? false : true,
+            hidden: name[2] == 11,
             label: name[0],
             data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1], created_at: d.beginning_of_day..d.end_of_day).where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
@@ -279,6 +280,7 @@ module EducodeSales
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
+            hidden: name[2] == 11, #role_id:11 离职角色
             data: dates.map { |d|
               d = d.split("-")
               year = d[0].to_i
@@ -306,6 +308,7 @@ module EducodeSales
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
+            hidden: name[2] == 11,
             data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01", "#{d}-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
             pointBorderColor: colors[i % 15 + 1],
@@ -324,6 +327,7 @@ module EducodeSales
           {
             # hidden: i < 3 ? false : true,
             label: name[0],
+            hidden: name[2] == 11,
             data: dates.map { |d| @follow_up = FollowUp.where(staff_id: name[1]).where("created_at >= ? AND created_at <= ?", "#{d}-01-01", "#{d}-12-31").where.not(business: x_business_ids).count },
             backgroundColor: "#fff",
             pointBorderColor: colors[i % 15 + 1],

data/app/controllers/educode_sales/sessions_controller.rb

@@ -40,6 +40,7 @@ module EducodeSales
           staff.save unless staff.persisted?
         end
         session[:admin_id] = staff.id
+        staff.create_login_history(request)
         return render_success
       else
         return render_failure('账号或密码错误')

data/app/controllers/educode_sales/user_behaviors_controller.rb

@@ -0,0 +1,26 @@
+require_dependency "educode_sales/application_controller"
+
+module EducodeSales
+  class UserBehaviorsController < ApplicationController
+    def index
+      respond_to do |format|
+        format.html do
+        end
+        format.json do
+          if params[:sort].present? && params[:sort][:field]
+            if params[:sort][:field] == 'name'
+              @data = LoginHistory.joins(staff: :user).order("users.lastname #{params[:sort][:order]}")
+            else
+              @data = LoginHistory.order("#{params[:sort][:field]} #{params[:sort][:order]}")
+            end
+          else
+            @data = LoginHistory.order(created_at: :desc)
+          end
+          @data = @data.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
+
+  end
+end

data/app/models/educode_sales/login_history.rb

@@ -0,0 +1,5 @@
+module EducodeSales
+  class LoginHistory < ApplicationRecord
+    belongs_to :staff
+  end
+end

data/app/models/educode_sales/staff.rb

@@ -15,12 +15,34 @@ module EducodeSales
     has_many :sale_plans, dependent: :destroy
     has_many :staff_schools, dependent: :destroy
 
+    has_many :login_histories, dependent: :destroy
+
     has_many :market_areas, dependent: :destroy
     has_many :areas, through: :market_areas
     validates :user_id, uniqueness: { message: '已存在' }
 
     # attr_writer :month
 
+    def last_login_key
+      "login_user_#{self.id}"
+    end
+
+    def check_login_status(request)
+      unless Rails.cache.data.get(self.last_login_key)
+        # 第二天还在线访问，记用户登录一次
+        create_login_history(request)
+      end
+    end
+
+    def create_login_history(request)
+      # 登录状态保存到当天结束时间后+10分钟
+      Rails.cache.data.set(self.last_login_key, 1)
+      Rails.cache.data.expireat(self.last_login_key, Time.now.end_of_day.to_i + 600)
+
+      last_history = self.login_histories.last
+      self.login_histories.create(current_ip: request.remote_ip, last_ip: last_history&.current_ip, last_login_at: last_history&.created_at)
+    end
+
     def self.month_list
       list = []
       24.times.map do |d|

data/app/views/educode_sales/sale_trends/trends.html.erb

@@ -474,12 +474,10 @@
 
 
         form.on('select(year)', function(data){
-          console.log(data, )
           year = data.value
           window.location.href = "/missions/sale_trends/trends?year=" + data.value
         })
         form.on('select(follow_count)', function(data){
-          console.log(data, )
             const value = data.value;
           if(value == "month"){
               $(".year").addClass('layui-hide')
@@ -506,7 +504,6 @@
         })
 
         form.on('select(goal_count)', function(data){
-          console.log(data, )
             const value = data.value;
           if(value == "month"){
               $(".goal_year").addClass('layui-hide')

data/app/views/educode_sales/user_behaviors/index.html.erb

@@ -0,0 +1,80 @@
+<script type="text/html" id="user_behaviors_topbar">
+  <div class="layui-btn-container">
+    <span class="table-label">行为分析</span>
+  </div>
+</script>
+<div class="min-height-table">
+  <table class="layui-hide" id="user_behaviors_table" lay-filter="user_behaviors_table"></table>
+</div>
+
+<script>
+    layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+      var $ = layui.jquery,
+          form = layui.form,
+          table = layui.table,
+          request = layui.request,
+          miniPage = layui.miniPage;
+
+      table.render({
+        elem: '#user_behaviors_table',
+        url: '/missions/user_behaviors',
+        totalRow:true,
+        toolbar: '#user_behaviors_topbar',
+        defaultToolbar: [],
+        cols: [
+          [
+            {
+              field: 'id',
+              title:'序号',
+              type: 'numbers',
+              width: 60
+            },
+            {
+              field: 'name',
+              title: '用户名',
+              width: 120,
+              sort: true,
+            },
+            {
+              field: 'last_ip',
+              title: '上次登录IP',
+              width: 120
+            },
+            {
+              field: 'current_ip',
+              title: '当前登录IP',
+              width: 120
+            },
+            {
+              field: 'last_login_at',
+              width: 200,
+              title: '上次登录时间',
+              sort: true,
+            },
+            {
+              field: 'created_at',
+              width: 200,
+              title: '当前登录时间',
+              sort: true,
+            }
+          ]
+        ],
+        limit: 20,
+        limits: [10,15,20,30,40,50,60,70,80,90],
+        page: true
+      });
+
+    var sort = {};
+    table.on('sort(user_behaviors_table)', function (obj) {
+      sort.field = obj.field;
+      sort.order = obj.type;
+      table.reload('user_behaviors_table', {
+        initSort: obj,
+        where: {
+          sort: sort
+        }
+      });
+    })
+      
+    });
+</script>

data/app/views/educode_sales/user_behaviors/index.json.jbuilder

@@ -0,0 +1,13 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.last_login_at d.last_login_at.to_s
+    json.created_at d.created_at.to_s
+    json.last_ip d.last_ip
+    json.current_ip d.current_ip
+    json.name d.staff&.user&.real_name
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/layouts/educode_sales/application.html.erb

@@ -121,13 +121,18 @@
             <% end %>
           </dl>
         </li>
-        <% if @current_admin.is_admin %>
+        <% if @current_admin.is_admin || @current_admin.code == 'userbe' %>
           <li class="layui-nav-item layui-nav-itemed menu-li">
             <a class="" href="javascript:;"><b><%= image_tag "educode_sales/13.系统设置.png",size:"15"%><i  style="font-size: 25px;  padding-right: 25px"></i>系统设置</b></a>
             <dl class="layui-nav-child">
+              <% if @current_admin.is_admin %>
               <dd><a href="/missions/roles" class="<%= current?('layui-this', roles_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/14.角色管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>角色管理</a></dd>
               <dd><a href="/missions/staffs" class="<%= current?('layui-this', staffs_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/15.人员管理.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>人员管理</a></dd>
               <dd><a href="/missions/commons" class="<%= current?('layui-this', commons_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/16.字典列表.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>字典列表</a></dd>
+              <% end %>
+              <% if @current_admin.code == 'userbe' %>
+              <dd><a href="/missions/user_behaviors" class="<%= current?('layui-this', user_behaviors_path) %>"><i  style="padding-right: 35px"></i><%= image_tag "educode_sales/9.运营分工.png",size:"15"%><i  style="font-size: 25px;  padding-right: 15px"></i>行为分析</a></dd>
+              <% end %>
             </dl>
           </li>
         <% end %>

data/config/routes.rb

@@ -19,7 +19,7 @@ EducodeSales::Engine.routes.draw do
   resources :sessions do
   end
 
-
+  resources :user_behaviors
   resources :customer_extensions do
   end
   resources :customer_follows do

data/db/migrate/20220827130438_create_educode_sales_login_histories.rb

@@ -0,0 +1,13 @@
+class CreateEducodeSalesLoginHistories < ActiveRecord::Migration[5.2]
+  def change
+    create_table :educode_sales_login_histories do |t|
+      t.references :staff
+      t.string :last_ip
+      t.string :current_ip
+      t.datetime :last_login_at
+
+      t.timestamps
+    end
+    add_column :educode_sales_staffs, :code, :string, comment: '特别业务权限用途'
+  end
+end

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.2'
+  VERSION = '0.9.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.2
+  version: 0.9.3
 platform: ruby
 authors:
 - anke1460
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-07-01 00:00:00.000000000 Z
+date: 2022-08-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,7 +105,6 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
-- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -168,6 +167,7 @@ files:
 - app/controllers/educode_sales/teacher_follows_controller.rb
 - app/controllers/educode_sales/teachers_controller.rb
 - app/controllers/educode_sales/upload_files_controller.rb
+- app/controllers/educode_sales/user_behaviors_controller.rb
 - app/helpers/educode_sales/activities_helper.rb
 - app/helpers/educode_sales/application_helper.rb
 - app/helpers/educode_sales/assessments_help.rb
@@ -197,6 +197,7 @@ files:
 - app/models/educode_sales/filter.rb
 - app/models/educode_sales/follow_up.rb
 - app/models/educode_sales/key_person.rb
+- app/models/educode_sales/login_history.rb
 - app/models/educode_sales/market_area.rb
 - app/models/educode_sales/money_plan.rb
 - app/models/educode_sales/operation_plan.rb
@@ -401,6 +402,8 @@ files:
 - app/views/educode_sales/teachers/show_follow_record.html.erb
 - app/views/educode_sales/teachers/unfinish_plans.json.jbuilder
 - app/views/educode_sales/upload_files/index.json.jbuilder
+- app/views/educode_sales/user_behaviors/index.html.erb
+- app/views/educode_sales/user_behaviors/index.json.jbuilder
 - app/views/layouts/educode_sales/application.html.erb
 - app/views/layouts/educode_sales/login.html.erb
 - config/locales/sale.zh-CN.yml
@@ -461,6 +464,7 @@ files:
 - db/migrate/20220512031715_add_column_o_business_deployment_to_follow_ups.rb
 - db/migrate/20220523023609_update_assessment_month_column_to_assessment_settings.rb
 - db/migrate/20220523101628_update_column_to_follow_ups.rb
+- db/migrate/20220827130438_create_educode_sales_login_histories.rb
 - lib/educode_sales.rb
 - lib/educode_sales/engine.rb
 - lib/educode_sales/version.rb
@@ -469,7 +473,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -484,8 +488,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.9
-signing_key: 
+rubygems_version: 3.0.0
+signing_key:
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []