educode_sales 0.9.62 → 0.9.64

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 15485a9308608796320e988b7095196d7747dffb82c6ac7478e146ca9a3034c4
-  data.tar.gz: b436c683fd104c2a599979a505e3507e6f117e98f7e525b51b1f3b1977aedb94
+  metadata.gz: e63a76d8b22ea7491a9ac03c2891cdf2e62d8fdfe902b2fa8b844cb4dbd79458
+  data.tar.gz: 77543a51348757e58029c047e0b2f42d620d618130024969b2f16e9ad3454942
 SHA512:
-  metadata.gz: 04b502321a7d5fd2136d97577802d45d502645651d26b59b0b2d7474c06e1e959a489d9c5930ff1e45b24b80d676f4b804570d7b58af7edd09d031e036b95ec2
-  data.tar.gz: 2daf5753d3ed08580c758f097751ae59a352159b2542c8b31fcafc30c6866becc7b56563a76a4de493efb1f1c4a0804e2b09618210a66c009184b7f86555f8f5
+  metadata.gz: 917b3a02eb534a97c87f5c4f8933db9bb72b3f63e655024300f9aea82646dc06438d7ce5de36055c2eda9b98f1118e7748f3883ce1448c49c8fa77598f0a5368
+  data.tar.gz: 9426d2279d8f35de786ad0d0b0f1aba56f37393225eb5e187c1cdc22885fdc0e347d431691decf4570ca0f10e3fbee53146609b4a5a1e81c4a58bf9d0d964e1c

data/app/controllers/educode_sales/activities_controller.rb

@@ -151,6 +151,18 @@ module EducodeSales
       render layout: false
     end
 
+    def show_schools
+      respond_to do |format|
+        format.html do
+          render layout: false
+        end
+        format.json do
+          @data = EducodeSales::ActivityTeacher.joins(teacher: [department: :school]).where(activity_id: params[:id]).select("count(teacher_id) AS teachers_count, departments.name AS department, schools.name AS school, school_id").group("school_id")
+          @data = @data.distinct.page(params[:page]).per(params[:limit])
+        end
+      end
+    end
+
     private
 
     def activity_params

data/app/controllers/educode_sales/businesses_controller.rb

@@ -346,6 +346,9 @@ module EducodeSales
       @quarter = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_quarter).count("DISTINCT(educode_sales_follow_ups.business_id)")
       @year = business.where("educode_sales_follow_ups.created_at >= ?",  Time.now.beginning_of_year).count("DISTINCT(educode_sales_follow_ups.business_id)")
 
+      @activities = EducodeSales::Activity.where(staff_id: @current_admin.id).where("created_at >= ?",  Time.now.beginning_of_month).count
+      @teachers = EducodeSales::Activity.joins(:teachers).where(staff_id: @current_admin.id).where("educode_sales_activities.created_at >= ?",  Time.now.beginning_of_month).count
+      @schools = EducodeSales::Activity.joins(teachers: :department).where(staff_id: @current_admin.id).where("educode_sales_activities.created_at >= ?",  Time.now.beginning_of_month).count("DISTINCT(departments.school_id)")
       render layout: false
     end
 

data/app/controllers/educode_sales/ideas_controller.rb

@@ -67,7 +67,7 @@ module EducodeSales
 
     def create
       idea = Idea.new(idea_params)
-      idea.school_id = Department.find_by_id(idea.department_id)&.school_id
+      # idea.school_id = Department.find_by_id(idea.department_id)&.school_id
       idea.creator = current_user
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
       idea.assist_staff_ids = assist_staff_ids
@@ -85,7 +85,7 @@ module EducodeSales
 
     def update
       @idea.assign_attributes(idea_params)
-      @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
+      # @idea.school_id = Department.find_by_id(@idea.department_id)&.school_id
       assist_staff_ids = Array(params[:assist_staff_ids].to_s.split(","))
       @idea.assist_staff_ids = assist_staff_ids
       check_changes
@@ -116,8 +116,8 @@ module EducodeSales
     def idea_params
       params.permit(:name, :level, :staff_id,
                     :status, :types, :model, :hardware, :project,
-                    :money, :end_time, :content, :department_id,
-                    :manager_name, :manager_phone,:school_name,:department_name,:sale_staff_id,:attachment_id)
+                    :money, :end_time, :content, :department_id, :school_id,
+                    :manager_name, :manager_phone, :school_name, :department_name, :sale_staff_id, :attachment_id)
     end
 
     def find_idea

data/app/controllers/educode_sales/teachers_controller.rb

@@ -92,7 +92,7 @@ module EducodeSales
           if params[:q].present? && params[:q][:status].present?
             if params[:q][:status] == "1"
               @teachers = @teachers.where("educode_sales_teachers.user_id is not null")
-            else
+          else
               @teachers = @teachers.where("educode_sales_teachers.user_id is null")
             end
           end
@@ -120,7 +120,11 @@ module EducodeSales
             ").where("province = ?", p)
           end
           if params[:activity_id].present?
-            @teachers = @teachers.joins(:activity_teachers).where("educode_sales_activity_teachers.activity_id = ?", params[:activity_id])
+            if params[:school_id].present?
+              @teachers = @teachers.joins(activity_teachers: [teacher: :department]).where("educode_sales_activity_teachers.activity_id = ? AND departments.school_id = ?", params[:activity_id], params[:school_id])
+            else
+              @teachers = @teachers.joins(:activity_teachers).where("educode_sales_activity_teachers.activity_id = ?", params[:activity_id])
+            end
           end
           if params[:q].present? && params[:q][:date].present?
             date = params[:q][:date].split(" - ")

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

@@ -74,7 +74,9 @@
 <script type="text/html" id="teachers_count">
   <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
 </script>
-
+<script type="text/html" id="schools_count">
+  <a href="javascript:void(0);" lay-event="schools_count" class="layui-table-link">{{ d.schools_count}}</a>
+</script>
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
         var $ = layui.jquery,
@@ -139,17 +141,24 @@
                   title: '天数',
                   width: 200
                 },
+                {
+                  field: 'schools_count',
+                  title: '学校数',
+                  width: 200,
+                  totalRow: true,
+                  templet: '#schools_count'
+                },
                 {
                   field: 'teachers_count',
                   title: '教师数',
                   width: 200,
-                    totalRow:true,
+                  totalRow:true,
                   templet: '#teachers_count'
                 },
                 {
                   field: 'students_count',
                   title: '学生数',
-                    totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
+                  totalRow:'{{ parseInt(d.TOTAL_NUMS) }}',
                   width: 200
                 },
                 {
@@ -284,8 +293,32 @@
               return false;
             }
              else if (obj.event === 'teachers_count') {
-                activity_id = obj.data.id
+                activity_id = obj.data.id;
+                school_id = '';
                 content = miniPage.getHrefContent('/missions/activities/show_teachers');
+                openWH = miniPage.getOpenWidthHeight();
+                index2 = layer.open({
+                  title: '活动列表/' + data.name,
+                  type: 1,
+                  shade: 0.2,
+                  maxmin: true,
+                  shadeClose: true,
+                  area: [openWH[0] + 'px', openWH[1] + 'px'],
+                  offset: [openWH[2] + 'px', openWH[3] + 'px'],
+                  content: content,
+                  success: function (layero, index) {
+                    form.render('select');
+                  },
+                });
+                $(window).on("resize", function () {
+                  layer.full(index);
+                });
+                return false;
+            } else if (obj.event == 'schools_count') {
+              activity_id = obj.data.id;
+              activity_name = data.name;
+              school_id = '';
+              content = miniPage.getHrefContent('/missions/activities/' + obj.data.id +'/show_schools');
               openWH = miniPage.getOpenWidthHeight();
               index2 = layer.open({
                 title: '活动列表/' + data.name,

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

@@ -1,4 +1,5 @@
 teachers_count = 0
+schools_count = 0
 json.data do
   json.array! @activities do |d|
     json.id d.id
@@ -15,11 +16,15 @@ json.data do
     json.staff_manage d.manages.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.staff_assist d.assists.map { |d| d.staff.user.real_name}.uniq.join("、")
     json.expert d.experts.pluck(:name).join("、")
+ 
+    json.schools_count EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count
+    schools_count +=  EducodeSales::ActivityTeacher.joins(teacher: :department).where(activity_id: d.id).select("distinct(school_id)").count
   end
 end
 
 json.totalRow do
   json.teachers_count teachers_count.to_s
+  json.schools_count schools_count.to_s
 end
 json.code 0
 json.count @activities.total_count

data/app/views/educode_sales/activities/show_schools.html.erb

@@ -0,0 +1,84 @@
+<div class="min-height-table">
+  <table class="layui-hide" id="show_school_table" style="min-height: 300px;" lay-filter="show_school_table"></table>
+</div>
+<script type="text/html" id="school_toolbar">
+  <div class="layui-btn-container">
+    <span class="table-label">教师列表</span>
+  </div>
+</script>
+  
+<script type="text/html" id="teachers_count">
+  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
+</script>
+  <script>
+  
+      layui.use(['form', 'table', 'miniPage', 'element', 'request'], function () {
+          var $ = layui.jquery,
+              form = layui.form,
+              request = layui.request,
+              miniPage = layui.miniPage;
+  
+          table = layui.table;
+          table.render({
+            elem: '#show_school_table',
+            url: '/missions/activities/' + parent.activity_id + '/show_schools',
+            defaultToolbar: ['filter'],
+            toolbar: '#school_toolbar',
+            cols: [
+                [
+                  {
+                  field: 'id',
+                  width: 60,
+                  title:'序号',
+                  type: 'numbers',
+                },
+                {
+                  field: 'school',
+                  width: 300,
+                  title: '单位',
+                },
+                {
+                  field: 'department',
+                  width: 200,
+                  title: '部门'
+                },
+                {
+                  field: 'teachers_count',
+                  title: '教师数',
+                  width: 120,
+                  templet: "#teachers_count"
+                },
+              ]
+            ],
+            page: true,
+          });
+
+
+        table.on('tool(show_school_table)', function (obj) {
+          if (obj.event === 'teachers_count') {
+            activity_id = parent.activity_id;
+            school_id = obj.data.school_id;
+            content = miniPage.getHrefContent('/missions/activities/show_teachers');
+            openWH = miniPage.getOpenWidthHeight();
+            index2 = layer.open({
+              title: '活动列表/' + parent.activity_name,
+              type: 1,
+              shade: 0.2,
+              maxmin: true,
+              shadeClose: true,
+              area: [openWH[0] + 'px', openWH[1] + 'px'],
+              offset: [openWH[2] + 'px', openWH[3] + 'px'],
+              content: content,
+              success: function (layero, index) {
+                form.render('select');
+              },
+            });
+            $(window).on("resize", function () {
+              layer.full(index);
+            });
+            return false;
+          }
+        })
+  
+      });
+  </script>

data/app/views/educode_sales/activities/show_schools.json.jbuilder

@@ -0,0 +1,12 @@
+json.data do
+  json.array! @data do |d|
+    json.id d.id
+    json.school_id d.school_id
+    json.school d['school']
+    json.department d['department']
+    json.teachers_count d['teachers_count']
+  end
+end
+
+json.code 0
+json.count @data.total_count

data/app/views/educode_sales/activities/show_teachers.html.erb

@@ -52,7 +52,7 @@
         table = layui.table;
         table.render({
             elem: '#show_teachers_table',
-            url: '/missions/teachers?activity_id=' + parent.activity_id,
+            url: '/missions/teachers?activity_id=' + parent.activity_id + "&school_id=" + (parent.school_id ? parent.school_id : ''),
             toolbar: '#teacher_toolbar',
             defaultToolbar: ['filter'],
             cols: [

data/app/views/educode_sales/businesses/daily_paper.html.erb

@@ -9,7 +9,12 @@
       本季-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @quarter %>, </span>
       本年-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @year %></span>
     </p>
-    <p style="margin-bottom: 30px;">二、本月已组织会议</p>
+    <p>二、本月已组织会议</p>
+    <p style="margin-bottom: 30px;">
+      活动-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @activities %>, </span>
+      学校-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @schools %>, </span>
+      教师-<span style="color: rgb(56, 150, 243);font-weight: bold;"><%= @teachers %></span>
+    </p>
     <p>三、客户跟进情况</p>
     <% text = "\n" %>
     <% text += "一、AB类商机开拓情况\n" %>
@@ -17,6 +22,9 @@
     <% text += "本季-#{@quarter }, "%>
     <% text += "本年-#{@year }\n\n"%>
     <% text += "二、本月已组织会议 \n\n"%>
+    <% text += "活动-#{@activities }, "%>
+    <% text += "学校-#{@schools }, "%>
+    <% text += "教师-#{@teachers }\n\n"%>
     <% text += "三、客户跟进情况 \n"%>
     <% @followups.each_with_index do |d, i| %>
       <% text += "#{i+1}、#{d.business&.department&.school&.name}--**商机：#{d.description}\n" %>

data/app/views/educode_sales/customers/edit.html.erb

@@ -84,6 +84,9 @@
 
 
         var dataCustom = [
+            { "n": '',
+              "s": []
+            },
             {
                 "n": "北京",
                 "s": [

data/config/routes.rb

@@ -266,6 +266,9 @@ EducodeSales::Engine.routes.draw do
     collection do
       get :show_teachers
     end
+    member do
+      get :show_schools
+    end
   end
 
   resources :sales do

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.9.62'
+  VERSION = '0.9.64'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.9.62
+  version: 0.9.64
 platform: ruby
 authors:
 - anke1460
@@ -237,6 +237,8 @@ files:
 - app/views/educode_sales/activities/index.html.erb
 - app/views/educode_sales/activities/index.json.jbuilder
 - app/views/educode_sales/activities/new.html.erb
+- app/views/educode_sales/activities/show_schools.html.erb
+- app/views/educode_sales/activities/show_schools.json.jbuilder
 - app/views/educode_sales/activities/show_teachers.html.erb
 - app/views/educode_sales/assessments/_finished.html.erb
 - app/views/educode_sales/assessments/_progress.html.erb