educode_sales 0.2.6 → 0.2.7

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 55cf3e4dddf35e304531c3e07672f44b45339e8e
-  data.tar.gz: 4ce03e6fa1240be69d451c5b53070dfcb8b3524c
+  metadata.gz: a7b0badd6354865f88cb4016fb2b4d6399b2e19a
+  data.tar.gz: 31b712f9a174d19191dc284957db22b20e2123fd
 SHA512:
-  metadata.gz: 95a1389179d95b934302d460664744e7e0c85a350e3c7c0d211a4e8d4fd4b87c452444c7cac011026a162d6ab1e1ea8d11d0663dc87bcb6d68969856235c3cec
-  data.tar.gz: f47350141309328ee7be016017f29797cc705cea0b0b0ce86063a6d834e1f1e14f0360aa7139cbf949b142b74be9ffe764cb18732d505a76d36cbaf9864c6cef
+  metadata.gz: a2206f34ebccc685009a8d9fe25ab7c8c47941d0718af2112b2373857163ca63f258552ffe3c41ea95ce3cff98251b2f986281e6387f7d1ca202a434e7cac491
+  data.tar.gz: c183901965584cb5986133bd959b75c43cfb0c34911e9dc8ac741990baf72e4c30b9fa561eb0fd6caa542007725da64d1f093b700c221607dae2ef465891a282

data/app/assets/stylesheets/educode_sales/layuimini.css

@@ -214,8 +214,10 @@
   /*position: fixed;*/
   overflow: hidden;
   bottom: 0px !important;
-  top: 60px !important;
+  top: 0px !important;
   transition: all .2s;
+  padding-top: 60px;
+  padding-bottom: 0px !important;
 }
 
 /**选择配色方案 */

data/app/controllers/educode_sales/teacher_follows_controller.rb

@@ -7,11 +7,11 @@ module EducodeSales
       follow_up = @teacher.teacher_follows.build(follow_up_params)
       follow_up.staff = @current_admin
       if @teacher.user_id.present?
-        course_ids = CourseMember.where(user_id: @teacher.user_id).where.not(role: 4).pluck(:course_id)
+        course_ids = CourseMember.joins(:course).where(user_id: @teacher.user_id, courses:{is_delete: 0}).where.not(role: 4).pluck(:course_id)
         follow_up.course_shixuns_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).pluck(:shixun_id).uniq.count
-        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id, role: 1).count
+        follow_up.shixuns_count = ShixunMember.where(user_id: @teacher.user_id).count
         follow_up.students_count = CourseMember.where(course_id: course_ids, role: 4).count
-        follow_up.evaluates_count = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).count
+        follow_up.evaluates_count = Course.where(id: course_ids).inject(0) { |i, d| i += d.evaluate_count }
         follow_up.courses_count = course_ids.size
       end
       if follow_up.save

data/app/controllers/educode_sales/teachers_controller.rb

@@ -213,7 +213,7 @@ module EducodeSales
             @follow_ups = @follow_ups.order("created_at desc")
           end
           @follow_ups = @follow_ups.page(params[:page]).per(params[:limit])
-          @latest = @follow_ups.order(created_at: :desc).first.created_at.to_s
+          @latest = @follow_ups.order(created_at: :desc).first
         end
       end
     end

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

@@ -48,6 +48,7 @@
                 {
                   field: 'name',
                   title: '活动名称',
+                  width: 300,
                   templet: '#teachers'
                 },
                 {

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

@@ -13,9 +13,9 @@
 </script>
 <script type="text/html" id="name">
   {{# if (d.login) { }}
-  <a href="/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
+  <a href="<%= base_url%>/users/{{d.login}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
   {{# } else {}}
-  <a href="/users/{{d.login}}" class="">{{ d.name }}</a>
+  <a href="<%= base_url%>/users/{{d.login}}" class="">{{ d.name }}</a>
   {{# }}}
 </script>
 <script type="text/html" id="courses">
@@ -113,7 +113,7 @@
                     templet: "#follow"
                 },
                 {
-                    field: 'actives',
+                    field: 'teacher_used',
                     width: 120,
                     title: '学院渗透率',
                 },

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

@@ -58,7 +58,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id) %>
+        <%= select_tag "place_id", options_for_select(@places, @follow_up.place_id), include_blank: true %>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -49,6 +49,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true,
       skin: 'line'

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

@@ -47,6 +47,7 @@
         align: "center"
         }]
       ],
+      height: 700,
       limit: 20,
       page: true
     })

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

@@ -72,6 +72,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true,
       skin: 'line'

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

@@ -75,6 +75,7 @@
                     parent.table.reload('teachers_table')
                     parent.table.reload('weekPlanTable1')
                     parent.table.reload('monthPlanTable')
+                    parent.table.reload('sale_plan_follow_table')
                 }
             })
 

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

@@ -152,11 +152,10 @@
             if (res.success == false) {
               layer.alert(res.msg)
             } else {
-                layer.closeAll();
-                table.reload('show_teachers_table');
-                table.reload('activities_table');
-                table.reload('teachers_table');
-
+              table.reload('show_teachers_table');
+              table.reload('activities_table');
+              table.reload('teachers_table');
+              layer.close(parent.index)
             }
           })
           return false;

data/app/views/educode_sales/teachers/show_follow.json.jbuilder

@@ -13,7 +13,7 @@ json.data do
     json.evaluates_count d.evaluates_count
     json.course_shixuns_count d.course_shixuns_count
     json.shixuns_count d.shixuns_count
-    json.is_latest d.created_at.to_s.eql?@latest
+    json.is_latest d.id == @latest.id
   end
 end
 

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.2.6'
+  VERSION = '0.2.7'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 0.2.6
+  version: 0.2.7
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-26 00:00:00.000000000 Z
+date: 2021-09-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails