educode_sales 0.2.4 → 0.2.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214d16e275e949155c7ab309bf772803b0babcbd
-  data.tar.gz: 4b91a047d3e910e1842f3ec4d9bf0f1a4a2d8cf0
+  metadata.gz: 42970300ca5db76b66dbe24f69cc7324ebc93960
+  data.tar.gz: eba2c4fec4458f262f0edc26d0f77e2ff82e7f03
 SHA512:
-  metadata.gz: 5577b6cec9f3b7e3431dca59c8d450cbb3a92b2e551c7940acf94d322b8c8f01c06358b55c945d3561f9b1a8110f1a490e30160b6d9a33a6561e02c0872f0435
-  data.tar.gz: 111b11aaa9a59e9f60e9d540df97f026b1abfcff092f26ca3157b319b083fdd21cb163c66c34e317275b78e1f3eebb9c78d12ddbfaf09de57414607e3faefc25
+  metadata.gz: 4aeaaf23d3a934295458a013cd789dccd72c47e66e5e26533c001414fde3ed6ebadd40e784efa540fa46ae0cb569871aacaf2cb4b82eacf0167d90c51d8ccdff
+  data.tar.gz: edf8246de28e7d1ea0bc7b60d7ac0c1ea3ffff6f9b51d076906cd4815c5bc6cacd72922132cab31733a1923cba785656ba5a0adc9c2cbdb343c58bfb86e5bb0f

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/home_controller.rb

@@ -17,9 +17,10 @@ module EducodeSales
 
     def search
       if params[:type] == 'department'
-        @data = Department.where("name like ?", "%#{params[:q]}%").limit(20)
+       
+       @data = Department.joins(:school).where("schools.name like :q", q: "%#{params[:q]}%").limit(20)
         unless @data.present?
-          @data = Department.joins(:school).where("schools.name like ?", "%#{params[:q]}%").limit(20)
+          @data = Department.where("name like ?", "%#{params[:q]}%").limit(20)
         end
       elsif params[:type] == "school"
         data = School.where("name like ? ", "%#{params[:q]}%").limit(20)

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

@@ -101,9 +101,9 @@ module EducodeSales
         # 把老师添加到活动列表，提取判断下老师列表是否存在
         find_teacher = Teacher.find_by(user_id: params[:user_id])
         if find_teacher
-          find_teacher.activity_teachers.build(activity_id: params[:activity_id])
           teacher = find_teacher
         end
+        teacher.activity_teachers.build(activity_id: params[:activity_id])
       end
       
       if teacher.save
@@ -130,8 +130,14 @@ module EducodeSales
     end
 
     def destroy
-      teacher = Teacher.find(params[:id])
-      teacher.destroy
+      if params[:activity_id].present?
+        activity_teacher = ActivityTeacher.find_by(activity_id: params[:activity_id], teacher_id: params[:id])
+        activity_teacher.destroy
+      else
+        teacher = Teacher.find(params[:id])
+        teacher.destroy
+      end
+     
       render_success
     end
 
@@ -207,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
@@ -245,7 +251,7 @@ module EducodeSales
     def course_list
       user = User.find_by(id: params[:user_id])
       if user
-      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).page(params[:page]).per(params[:limit])
+      @courses = Course.joins(:course_members).where(course_members: {user_id: user.id}).distinct("course_id").page(params[:page]).per(params[:limit])
       else
         @courses = Course.none
       end

data/app/helpers/educode_sales/application_helper.rb

@@ -40,5 +40,17 @@ module EducodeSales
     def relative_path
       "avatars"
     end
+
+    def base_url
+      url = Rails.application.config_for(:configuration)['wechat_pay']['callback_url']
+      if url.include?("https://data.educoder")
+        "https://www.educoder.net"
+      elsif url.include?("'https://pre-data.educoder")
+        "https://pre.educoder.net"
+      else
+        "https://test.educoder.net"
+      end
+    end
+
   end
 end

data/app/models/educode_sales/teacher.rb

@@ -1,6 +1,6 @@
 module EducodeSales
   class Teacher < ApplicationRecord
-    has_many :activity_teachers
+    has_many :activity_teachers, dependent: :destroy
     has_many :activities, through: :activity_teachers
     has_many :teacher_follows, dependent: :destroy
     has_many :operation_plans, dependent: :destroy
@@ -19,7 +19,7 @@ module EducodeSales
         user_ids = User.joins(:user_extension).where(user_extensions: {department_id: self.department_id, identity: 0}).pluck(:id)
         course_ids = CourseMember.where(role: "CREATOR", user_id: user_ids).pluck(:course_id)
         if course_ids.present?
-          course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 30").select("COUNT(*) AS count")
+          course_members = CourseMember.joins(course: :practice_homework_shixuns).where(course_id: course_ids).group("course_id").having("COUNT(homework_commons_shixuns.id) > 100 AND COUNT(course_members.user_id) > 20").select("COUNT(case when course_members.role !=4 then 1 END) AS count")
           course_members.present? ? course_members[0]['count'] : 0
         else
           0

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

@@ -48,6 +48,7 @@
                 {
                   field: 'name',
                   title: '活动名称',
+                  width: 300,
                   templet: '#teachers'
                 },
                 {
@@ -80,6 +81,7 @@
                 }
               ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

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: '学院渗透率',
                 },
@@ -245,9 +245,10 @@
             } else if (obj.event === 'delete') {
                 console.log(data);
                 layer.confirm('确定删除' + data.name, function (index) {
-                    request.delete('educode_sales/teachers/' + data.id, {}, function (res) {
-                        layer.close(index);
-                        table.reload("show_teachers_table")
+                    request.delete('educode_sales/teachers/' + data.id, {activity_id: activity_id}, function (res) {
+                      layer.close(index);
+                      table.reload("activities_table")
+                      table.reload("show_teachers_table")
                     })
                 });
             } else if (obj.event === 'addWeek') {

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/businesses/index.html.erb

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

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

@@ -62,7 +62,7 @@
     <div class="layui-inline">
       <label class="layui-form-label">渠道</label>
       <div class="layui-input-inline">
-        <%= select_tag "place_id", options_for_select(@places, @last_follow_up&.place_id) %>
+        <%= select_tag "place_id", options_for_select(@places, @last_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/operation_plans/_monthPlan.html.erb

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

data/app/views/educode_sales/operation_plans/_monthly.html.erb

@@ -164,6 +164,7 @@
                     });
                 })
             },
+            height: 600,
             limit: 20,
             page: true
         });

data/app/views/educode_sales/operation_plans/_weekPlan.html.erb

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

data/app/views/educode_sales/operation_plans/_weekly.html.erb

@@ -165,6 +165,7 @@
                     });
                 })
             },
+            height: 600,
             limit: 20,
             page: true,
         });

data/app/views/educode_sales/operation_plans/edit_month.html.erb

@@ -22,7 +22,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/operation_plans/edit_monthly.html.erb

@@ -22,7 +22,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

data/app/views/educode_sales/operation_plans/edit_week.html.erb

@@ -30,7 +30,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/operation_plans/edit_weekly.html.erb

@@ -22,7 +22,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/operation_plans/new_monthly.html.erb

@@ -24,7 +24,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -25,7 +25,7 @@
         <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

data/app/views/educode_sales/operation_plans/new_weekly.html.erb

@@ -24,7 +24,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -22,7 +22,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -74,6 +74,7 @@
                   }
                 ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

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

@@ -140,6 +140,7 @@
               }
               ]
             ],
+            height: 600,
             limit: 20,
             page: true,
         });
@@ -181,7 +182,7 @@
               var openWH = miniPage.getOpenWidthHeight();
               from_sales = true
               sindex = layer.open({
-                  title: '添加计划',
+                  title: '添加月计划',
                   type: 1,
                   shade: 0.2,
                   maxmin: true,

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

@@ -169,6 +169,7 @@
           });
         })
       },
+      height: 600,
       limit: 20,
       page: true
     });

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

@@ -145,6 +145,7 @@
               }
             ]
           ],
+          height: 600,
           limit: 20,
           page: true,
           skin: 'line'
@@ -188,7 +189,7 @@
             var content = miniPage.getHrefContent('/educode_sales/plans/new_week');
             var openWH = miniPage.getOpenWidthHeight();
             sindex = layer.open({
-              title: '添加计划',
+              title: '添加周计划',
               type: 1,
               shade: 0.2,
               maxmin: true,

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

@@ -170,6 +170,7 @@
               });
             })
           },
+          height: 600,
           limit: 20,
           page: true
         });

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -28,7 +28,7 @@
         <textarea name="desc" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-form-item layui-form-text">

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

@@ -26,7 +26,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"><%= @sale_plan.content %></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"><%= @sale_plan.content %></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -31,7 +31,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -18,7 +18,7 @@
         <textarea name="content" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -31,7 +31,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -24,7 +24,7 @@
         <textarea name="content" lay-verify="required" placeholder="简要填写具体的营销计划，例如：
 1、推动xx老师用起来；
 2、与xx老师介绍一下我们的方案；
-3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea"></textarea>
+3、与xx领导深度沟通一下，以获取到关键建设规划信息等等。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline">

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

@@ -29,7 +29,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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/sale_reports/edit.html.erb

@@ -26,7 +26,7 @@
         <textarea name="content" placeholder="此处填写要点：
 1、一句话概括本周工作的主要成效和主要挫折；
 2、补充说明收获、经验；
-3、补充说明需要上级解决的问题和挑战。" class="layui-textarea"><%= @sale_report.content %></textarea>
+3、补充说明需要上级解决的问题和挑战。" class="layui-textarea" rows="10"><%= @sale_report.content %></textarea>
       </div>
     </div>
     <div class="layui-inline m-t-10">

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

@@ -59,6 +59,7 @@
           }
         ]
       ],
+      height: 700,
       limit: 20,
       page: true
     });

data/app/views/educode_sales/sales/operations.html.erb

@@ -61,6 +61,7 @@
                 },
                 ]
             ],
+            height: 700,
             limit: 20,
             page: true
         });

data/app/views/educode_sales/sessions/login.html.erb

@@ -1,6 +1,6 @@
 <div class="login-main">
   <div class="login-top">
-    <span>头歌营销支撑系统</span>
+    <span>头歌营销系统</span>
     <span class="bg1"></span>
     <span class="bg2"></span>
   </div>

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/index.html.erb

@@ -88,7 +88,7 @@
 </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="javascript:;" class="">{{ d.name }}</a>
   {{# }}}
@@ -226,6 +226,7 @@
                 }
               ]
             ],
+            height: 600,
             limit: 20,
             page: true,
         });

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

@@ -14,13 +14,12 @@ json.data do
     json.source EducodeSales::Common.teacher_source_name[d.source_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.courses_count d.user_id ? Course.joins(:course_members).where(course_members: {user_id: d.user_id}).distinct("course_id").count : 0
     json.actives d.actives
     json.students d.students_count
-    json.regist_at d.regist_at ? d.regist_at.to_s(:date) : ''
+    json.regist_at d.user.present? ? d.user.created_on.to_s(:date) : ''
     json.teacher_used d.teacher_used_of_department
   end
 end
 json.code 0
-json.count @teachers.total_count
-json.msg 'succcess'
+json.count @teachers.total_count

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_class.html.erb

@@ -1,6 +1,6 @@
 
 <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>
+  <a href="<%= base_url %>/classrooms/{{d.id}}" class="layui-table-link" target="_blank">{{ d.name }}</a>
 </script>
 
 <table class="layui-hide" id="class_T" lay-filter="classFilter"></table>
@@ -23,7 +23,7 @@
                 {
                     field: 'name',
                     width: 150,
-                    title: '课程名称',
+                    title: '课堂名称',
                     templet: "#class_name"
 
                 },

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.4'
+  VERSION = '0.2.8'
 end

metadata

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