educode_sales 0.1.3 → 0.1.8

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

@@ -12,13 +12,15 @@ json.data do
     json.teacher_follows_count d.teacher_follows_count
     json.activities_count d.activity_teachers_count
     json.source EducodeSales::Common.teacher_source_name[d.source_id]
-    json.attitude EducodeSales::Common.key_attitude_name[d.attitude_id]
+    # a_id = EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).present? ? EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id : 73
+    json.attitude EducodeSales::TeacherFollow.find_by(teacher_id: d.id).present? ? EducodeSales::Common.find(EducodeSales::TeacherFollow.order(created_at: :desc).find_by(teacher_id: d.id).attitude_id).name : ''
     json.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).count : 0
     json.actives d.actives
-    json.students d.students
+    json.students d.students_count
     json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end
 end
 json.code 0
+json.count @teachers.total_count
 json.msg 'succcess'

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

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

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

@@ -79,6 +79,8 @@
                     parent.table.reload('teachers_table')
                     parent.table.reload('weekPlanTable1')
                     parent.table.reload('monthPlanTable')
+                    parent.table.reload('monthlyTable')
+                    parent.table.reload('weeklyTable')
                 }
             })
 

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

@@ -1,4 +1,8 @@
 
+<script type="text/html" id="class_name">
+  <a href="https://test-data.educoder.net/classrooms/{{d.id}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
+</script>
+
 <table class="layui-hide" id="class_T" lay-filter="classFilter"></table>
 <script>
     layui.use(['form', 'table'], function () {
@@ -20,6 +24,8 @@
                     field: 'name',
                     width: 150,
                     title: '课程名称',
+                    templet: "#class_name"
+
                 },
                 {
                     field: 'teachers',

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

@@ -17,4 +17,4 @@ json.data do
 end
 
 json.code 0
-json.count @follow_ups.count
+json.count @follow_ups.total_count

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

@@ -11,4 +11,4 @@ json.data do
 end
 
 json.code 0
-json.count @plans.count
+json.count @plans.total_count

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.3'
+  VERSION = '0.1.8'
 end

metadata

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