educode_sales 0.2.4 → 0.2.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 214d16e275e949155c7ab309bf772803b0babcbd
-  data.tar.gz: 4b91a047d3e910e1842f3ec4d9bf0f1a4a2d8cf0
+  metadata.gz: 384aa48b4fd48766ddfc7db4adcf12f640b9adbf
+  data.tar.gz: 7761bc4921a22238d59836aa55c08ee27f3387f9
 SHA512:
-  metadata.gz: 5577b6cec9f3b7e3431dca59c8d450cbb3a92b2e551c7940acf94d322b8c8f01c06358b55c945d3561f9b1a8110f1a490e30160b6d9a33a6561e02c0872f0435
-  data.tar.gz: 111b11aaa9a59e9f60e9d540df97f026b1abfcff092f26ca3157b319b083fdd21cb163c66c34e317275b78e1f3eebb9c78d12ddbfaf09de57414607e3faefc25
+  metadata.gz: b71058d21d50127f1bf6526ecdd4c3b843fe426d3988f0289c101979bda12df16980aceae09f3b344458c089bc4bc840a384a4f540388c8bfa5ed1742cf191f4
+  data.tar.gz: 234eb2e4fccc311cc35d88d2da52366364cce6bead12233ab83e856943f744599772650555e76389d53a57e86479ebbde7a64882a23c46bec1436fd1984e4e8c

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

@@ -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/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>
   {{# }}}

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.regist_at && d.user_id ? 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'
+json.count @teachers.total_count

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

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