educode_sales 1.10.46 → 1.10.48

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ee0e4fc5519c5e1dc171f8d0402f6f3e681e9b89636a7f424a642aaf88a23ce9
-  data.tar.gz: c060d33dfc08508f868182e5c3b8f8d780a20c03d8c300631a7a7c39316bfccc
+  metadata.gz: da45d6ae994d92a3ef3274e654b591e9165ba976e765e2c8e09b786f7f0b5c05
+  data.tar.gz: fe907bc45b55f7dbe5b454eb785693302f460622576a7a14cde80efc9cf3d293
 SHA512:
-  metadata.gz: 5d82966240ed50554d5525c93254d1f282fe9a604e350f9ae81309726187f43d419e9849b1047f6b996bd6bebd91c12d57b0ea1c9691e5913eb41a29da0df206
-  data.tar.gz: 433b7c1181791a6a47a5d35ff5df90363607e9d8c1592056d9fbf546b373c42a29d0bc67d92bdfc67b7f6f504970ff61edf55a2b5b992e3d993dc2fe3861cc14
+  metadata.gz: 8dc1ac6fd68d7a04df6f28d39a74f565701600b25348c60a6586f3b8027f63b796132489e6f0dd37e4a896ee9241f44c5764ec5f4fb2e740b38033060c0ff10f
+  data.tar.gz: b3b6130b8e98a8b5bdd05281af4f7faf27e690725de86337fec94abf974b8be798f8a451ed4f549affbe8e548bd66bd485b3f177a80b70e57f74f59c49459fe1

data/app/controllers/educode_sales/follow_ups_controller.rb

@@ -114,11 +114,15 @@ module EducodeSales
       last_follow_up = @business.last_follow_up
       if @business.clazz.present?
         follow_up.clazz_changed = @business.clazz_id != follow_up.clazz_id
-        if follow_up.clazz_changed 
+        if follow_up.clazz_changed
           if @business.clazz.extras == 'a_class'
             @business.state_id = 3
           end
-          clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          if @business.clazz.extras.present? && follow_up.clazz.extras.present?
+            clazz_changes = "#{@business.clazz.extras.split('_')[0]}-#{follow_up.clazz.extras.split('_')[0]}"
+          else
+            clazz_changes = "-"
+          end
           business_clazz_change = EducodeSales::BusinessClazzChange.find_or_initialize_by(business_id: @business.id, clazz_changed: clazz_changes)
           business_clazz_change.save unless business_clazz_change.persisted?
         end

data/app/controllers/educode_sales/teachers_controller.rb

@@ -206,8 +206,19 @@ module EducodeSales
           if params[:q].present? && params[:q][:is_contact].present?
             @teachers = @teachers.where("last_follow.is_contact = ?", params[:q][:is_contact].to_i)
           end
-
-          if params[:sort].present? && params[:sort][:field]
+          if params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'created_at'
+            @teachers = @teachers.order("educode_sales_teachers.created_at #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'last_login_on'
+            @teachers = @teachers.order("users.last_login_on #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'created_on'
+            @teachers = @teachers.order("users.created_on #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'latest_time'
+            @teachers = @teachers.order("last_follow.created_at #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'experience'
+            @teachers = @teachers.order("users.experience #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field] && params[:sort][:field] == 'grade'
+            @teachers = @teachers.order("users.grade #{params[:sort][:order]}")
+          elsif params[:sort].present? && params[:sort][:field]
             @teachers = @teachers.order("#{params[:sort][:field]} #{params[:sort][:order]}")
           else
             @teachers = @teachers.order("educode_sales_teachers.created_at desc")

data/lib/educode_sales/version.rb

@@ -1,3 +1,3 @@
 module EducodeSales
-  VERSION = '1.10.46'
+  VERSION = '1.10.48'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: educode_sales
 version: !ruby/object:Gem::Version
-  version: 1.10.46
+  version: 1.10.48
 platform: ruby
 authors:
 - anke1460
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-07-28 00:00:00.000000000 Z
+date: 2023-07-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -105,6 +105,7 @@ files:
 - app/assets/images/educode_sales/icon-login.png
 - app/assets/images/educode_sales/icon.png
 - app/assets/images/educode_sales/indexLogo.png
+- app/assets/images/educode_sales/indexlogo.png
 - app/assets/images/educode_sales/loading-0.gif
 - app/assets/images/educode_sales/loading-1.gif
 - app/assets/images/educode_sales/loading-2.gif
@@ -761,7 +762,7 @@ homepage: https://www.educoder.net
 licenses:
 - MIT
 metadata: {}
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -776,8 +777,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.0
-signing_key:
+rubygems_version: 3.0.9
+signing_key: 
 specification_version: 4
 summary: Summary of EducodeSales.
 test_files: []