educode_sales 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b0b586bc3b1634320b6fb34e4646577e51cd2eed
-  data.tar.gz: a05dcbb55cc2e2e8f3e7dfbc7671d5f89c24fca5
+  metadata.gz: 82d677b53ce6178046e2f6e663dabe5a5789762f
+  data.tar.gz: 174acd6fb6a9bf597dddd2783dd0a9f23139abea
 SHA512:
-  metadata.gz: 7099d303b654990b619fcad31ddf547c3412be01a359bb00c0fec6534f32a7764326d512916536d1dbd1710193bddb08b370096250c21fc5dedc976bfc786f12
-  data.tar.gz: 17ac1d2f5b4b134147ca1b77b53c340c04389269e2f1b8b89c9b89c90893eed640c5cb5980f0be28a10e8ada7c18f927d2b326069d1a0f47d237902f13b5f832
+  metadata.gz: e6c888d00d3cb588d67982a88c3b316085ba23ac19c926a4e7f37810262c3dda76ce0a736f94e883ca0e89d69c5ab54d7c5d3e18bd457071a3e6ad76455c7a6e
+  data.tar.gz: 62eee795ac83adfe2f6d2cf102ae34557f8f291c9b836f4505042d447850c0cdeb86d0bf65de3358f18883ccd653ab893c3188168e6581d69edce52aca867dae

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

@@ -22,7 +22,7 @@
   <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.name}}</a>
 </script>
 <script type="text/html" id="teachers_count">
-  <a href="javascript:void(0);" lay-event="teachers" class="layui-table-link">{{ d.teachers_count}}</a>
+  <a href="javascript:void(0);" lay-event="teachers_count" class="layui-table-link">{{ d.teachers_count}}</a>
 </script>
 
 <script>
@@ -173,6 +173,28 @@
               });
               return false;
             }
+             else if (obj.event === 'teachers_count') {
+                activity_id = obj.data.id;
+                content = miniPage.getHrefContent('/educode_sales/activities/show_teachers');
+              openWH = miniPage.getOpenWidthHeight();
+              index = 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;
+            }
         });
 
     });

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

@@ -247,10 +247,11 @@
                 });
                 return false;
             } else if (obj.event === 'delete') {
+                console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/businesses/' + data.id, {}, function (res) {
+                    request.delete('educode_sales/teachers/' + data.id, {}, function (res) {
                         layer.close(index);
-                        table.reload("teachers_table")
+                        table.reload("show_teachers_table")
                     })
                 });
             } else if (obj.event === 'addWeek') {
@@ -288,7 +289,8 @@
                 });
 
             } else if (obj.event === 'courses') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses');
+                teacher_id = data.id
+                content = miniPage.getHrefContent('/educode_sales/teachers/add_courses?id='+data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '课程方向',
@@ -298,12 +300,16 @@
                     shadeClose: true,
                     area: [openWH[0] + 'px', openWH[1] + 'px'],
                     offset: [openWH[2] + 'px', openWH[3] + 'px'],
-                    content: content
+                    content: content,
+                    success: function (layero, index) {
+                        // 重新渲染弹层中的下拉选择框select
+                        // form.render('select');
+                    }
                 });
                 $(window).on("resize", function () {
-                  layer.full(index);
+                    layer.full(index);
                 });
-            } else if (obj.event === 'event') {
+            }else if (obj.event === 'event') {
                 content = miniPage.getHrefContent('/educode_sales/teachers/add_event');
                 openWH = miniPage.getOpenWidthHeight();
                 teacher_id = obj.data.id
@@ -342,7 +348,7 @@
                     layer.full(index);
                 });
             } else if (obj.event === 'follow') {
-                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow');
+                content = miniPage.getHrefContent('/educode_sales/teachers/show_follow?id=' + data.id);
                 openWH = miniPage.getOpenWidthHeight();
                 index = layer.open({
                     title: '跟进记录',

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

@@ -19,4 +19,5 @@ json.data do
   end
 end
 json.code 0
+json.count @courses.total_count
 json.msg 'succcess'

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

@@ -151,7 +151,7 @@
                 },
                 {
                     field: 'department',
-                    width: 190,
+                    width: 250,
                     title: '部门'
                 },
                 {

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

@@ -12,7 +12,8 @@ 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.teacher_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_count

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/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/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '0.1.7'
+  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.7
+  version: 0.1.8
 platform: ruby
 authors:
 - anke1460
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-09-17 00:00:00.000000000 Z
+date: 2021-09-18 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails