educode_sales 1.10.14 → 1.10.16

data/app/controllers/educode_sales/customers_controller.rb

@@ -220,18 +220,10 @@ module EducodeSales
             s.department_business_count,
             s.major_count,
             s.department_id,
-            departments.name AS department_name,
-            t.teacher_count,
-            t.student_count
+            departments.name AS department_name
           ").joins("
             JOIN schools ON s.id = schools.id
-            LEFT JOIN departments ON s.department_id = departments.id
-            LEFT JOIN (
-              SELECT COUNT(IF(user_extensions.identity = 0, user_extensions.id, 0)) AS teacher_count,
-                     COUNT(IF(user_extensions.identity = 1, user_extensions.id, 1)) AS student_count, user_extensions.department_id
-               FROM user_extensions
-               GROUP BY user_extensions.department_id
-            ) AS t ON  t.department_id = s.department_id
+            LEFT JOIN departments ON schools.id = departments.school_id AND s.department_id = departments.id
           ")
 
           # part_a_ids = CustomerFollow.all.pluck(:school_id)

data/app/controllers/educode_sales/teachers_controller.rb

@@ -118,13 +118,17 @@ module EducodeSales
           if params[:q].present? && params[:q][:professional_title].present?
             @teachers = @teachers.where("educode_sales_teachers.professional_title = ?", "#{params[:q][:professional_title]}")
           end
+          # if params[:q].present? && params[:q][:regist_at].present?
+          #   @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
+          # end
           if params[:q].present? && params[:q][:regist_at].present?
-            @teachers = @teachers.where("educode_sales_teachers.regist_at like ?", "%#{params[:q][:regist_at]}%")
+            date = params[:q][:regist_at].split(" - ")
+            @teachers = @teachers.where("educode_sales_teachers.regist_at > ? AND educode_sales_teachers.regist_at < ?", date[0], date[1])
           end
           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

data/app/views/educode_sales/customers/list.json.jbuilder

@@ -2,6 +2,13 @@
 department_ids = @customers.map(&:department_id).uniq
 customer_ids = @customers.map(&:id).uniq
 
+user_extensions = UserExtension.select(
+  "COUNT(IF(user_extensions.identity = 0, user_extensions.id, 0)) AS teacher_count,
+   COUNT(IF(user_extensions.identity = 1, user_extensions.id, 1)) AS student_count,
+   department_id"
+).where(department_id: department_ids).group("department_id").group_by(&:department_id)
+
+
 business_ids_group_a = EducodeSales::Business.where(department_id: department_ids).group_by(&:department_id)
 business_ids_group_b = EducodeSales::Business.where(school_id: customer_ids).group_by(&:school_id)
 all_follow_ups = EducodeSales::FollowUp.where(business_id: business_ids_group_a.values.flatten.map(&:id) + business_ids_group_b.values.flatten.map(&:id))
@@ -37,9 +44,13 @@ json.data do
     if d['department_id']
       json.business d['department_business_count'] || 0
       json.o_business o_business_count_group_a[d['department_id']] || 0
+      json.teacher_counts user_extensions[d['department_id']] && user_extensions[d['department_id']][0]['teacher_count'] || 0
+      json.student_counts user_extensions[d['department_id']] && user_extensions[d['department_id']][0]['student_count'] || 0
     else
       json.business d['school_business_count'] || 0
       json.o_business o_business_count_group_b[d.id] || 0
+      json.teacher_counts 0
+      json.student_counts 0
     end
     json.unit "#{d.name}---#{d['department_name']}"
 
@@ -48,8 +59,6 @@ json.data do
     json.department d['department_name'] || ''
     json.major_count d['major_count']
     json.department_id d['department_id'] || ''
-    json.teacher_counts d['teacher_count'] || 0
-    json.student_counts d['student_count'] || 0
   end
 end
 

data/app/views/educode_sales/plans/new_month.html.erb

@@ -9,7 +9,14 @@
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">
-         <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+         <% if @business %>
+         <div style="line-height: 38px;">
+          <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+          <%= hidden_field_tag "business_id", @business.id %>
+         </div>
+         <% else %>
+           <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+         <% end %>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/plans/new_week.html.erb

@@ -15,7 +15,15 @@
     <div class="layui-inline">
       <label class="layui-form-label required">商机</label>
       <div class="layui-input-inline" style="width: 500px">
-        <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% if @business %>
+        <div style="line-height: 38px;">
+         <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+         <%= hidden_field_tag "business_id", @business.id %>
+        </div>
+        <% else %>
+          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% end %>
+       
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/plans/new_year.html.erb

@@ -9,7 +9,14 @@
     <div class="layui-inline">
       <label class="layui-form-label required">选择商机</label>
       <div class="layui-input-inline" style="width: 400px">
-        <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true, "lay-search": "" } %>
+        <% if @business %>
+        <div style="line-height: 38px;">
+         <%= "#{@business.name} (#{@business.department&.school&.name} #{@business.department&.name})" %>
+         <%= hidden_field_tag "business_id", @business.id %>
+        </div>
+        <% else %>
+          <%= select_tag "business_id", options_for_select(@businesses, @business&.id), {"lay-verify": "required", include_blank: true} %>
+        <% end %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -13,7 +13,7 @@
            <div class="layui-input-block">
              <% d.each do |p| %>
                <% id += 1 %>
-               <%= check_box_tag "permission[#{p.subject}][]", p.action, @permissions.include?(p.id), {title: p.name, id: "#{id}_" } %>
+               <%= check_box_tag "permission[#{p.subject}][]", p.action, @permissions.include?(p.id), {title: p.name, id: "#{id}_", "lay-skin": "tag" } %>
              <% end %>
           </div>
         </div>

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

@@ -79,7 +79,7 @@
           <div class="layui-input-block">
             <% d.each do |p| %>
               <% id += 1 %>
-              <%= check_box_tag "permission[#{p.subject}][]", p.action, @permissions.include?(p.id), {title: p.name, id: "#{id}_" } %>
+              <%= check_box_tag "permission[#{p.subject}][]", p.action, @permissions.include?(p.id), {title: p.name, id: "#{id}_", "lay-skin": "tag"} %>
             <% end %>
           </div>
         </div>

data/app/views/educode_sales/teachers/_index.html.erb

@@ -150,11 +150,11 @@
 <script>
     layui.use(['form', 'table', 'miniPage', 'element', 'request', 'laydate'], function () {
         var $ = layui.jquery,
-            form = layui.form,
-            request = layui.request,
-            dropdown = layui.dropdown,
-            miniPage = layui.miniPage,
-            laydate = layui.laydate;
+          form = layui.form,
+          request = layui.request,
+          dropdown = layui.dropdown,
+          miniPage = layui.miniPage,
+          laydate = layui.laydate;
 
         var laydate = layui.laydate;
 
@@ -164,6 +164,7 @@
         });
         laydate.render({
             elem: '#time',
+            range: true
         });
 
         cols_table = [[
@@ -384,7 +385,7 @@
             },
             {
                 title: '操作',
-                minWidth: 170,
+                minWidth: 300,
                 toolbar: '#currentTableBar',
                 align: "center",
                 fixed: 'right'

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.14'
+  VERSION = '1.10.16'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.14
+  version: 1.10.16
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-06-20 00:00:00.000000000 Z
+date: 2023-06-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails